diff --git a/packages/data/src/components/with-dispatch/test/index.js b/packages/data/src/components/with-dispatch/test/index.js
index 98f225fad2c406..4bde9b30810ac1 100644
--- a/packages/data/src/components/with-dispatch/test/index.js
+++ b/packages/data/src/components/with-dispatch/test/index.js
@@ -8,7 +8,7 @@ import TestRenderer from 'react-test-renderer';
  */
 import withDispatch from '../';
 import { createRegistry } from '../../../registry';
-import RegistryProvider from '../../registry-provider';
+import { RegistryProvider } from '../../registry-provider';
 
 describe( 'withDispatch', () => {
 	let registry;
diff --git a/packages/viewport/src/test/if-viewport-matches.js b/packages/viewport/src/test/if-viewport-matches.js
index c5eca13c0ea14d..4a57039e9c7f1b 100644
--- a/packages/viewport/src/test/if-viewport-matches.js
+++ b/packages/viewport/src/test/if-viewport-matches.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import TestRenderer from 'react-test-renderer';
+import TestRenderer, { act } from 'react-test-renderer';
 
 /**
  * WordPress dependencies
@@ -20,16 +20,24 @@ describe( 'ifViewportMatches()', () => {
 	it( 'should not render if query does not match', () => {
 		dispatch( 'core/viewport' ).setIsMatching( { '> wide': false } );
 		const EnhancedComponent = ifViewportMatches( '> wide' )( Component );
-		const testRenderer = TestRenderer.create( <EnhancedComponent /> );
+
+		let testRenderer;
+		act( () => {
+			testRenderer = TestRenderer.create( <EnhancedComponent /> );
+		} );
 
 		expect( testRenderer.root.findAllByType( Component ) ).toHaveLength( 0 );
 	} );
 
 	it( 'should render if query does match', () => {
-		dispatch( 'core/viewport' ).setIsMatching( { '> wide': true } );
+		act( () => {
+			dispatch( 'core/viewport' ).setIsMatching( { '> wide': true } );
+		} );
 		const EnhancedComponent = ifViewportMatches( '> wide' )( Component );
-		const testRenderer = TestRenderer.create( <EnhancedComponent /> );
-
+		let testRenderer;
+		act( () => {
+			testRenderer = TestRenderer.create( <EnhancedComponent /> );
+		} );
 		expect( testRenderer.root.findAllByType( Component ) ).toHaveLength( 1 );
 	} );
 } );