diff --git a/packages/data/src/components/use-select/test/index.js b/packages/data/src/components/use-select/test/index.js
index 4b7babcedeaac7..54ef15098d5b60 100644
--- a/packages/data/src/components/use-select/test/index.js
+++ b/packages/data/src/components/use-select/test/index.js
@@ -1,7 +1,8 @@
 /**
  * External dependencies
  */
-import { act, render, fireEvent, screen } from '@testing-library/react';
+import { act, render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 /**
  * WordPress dependencies
@@ -435,7 +436,9 @@ describe( 'useSelect', () => {
 			);
 		} );
 
-		it( 'captures state changes scheduled between render and effect', () => {
+		it( 'captures state changes scheduled between render and effect', async () => {
+			const user = userEvent.setup();
+
 			registry.registerStore( 'store-1', counterStore );
 
 			class ChildComponent extends Component {
@@ -484,7 +487,7 @@ describe( 'useSelect', () => {
 				</RegistryProvider>
 			);
 
-			fireEvent.click( screen.getByText( 'triggerChildDispatch' ) );
+			await user.click( screen.getByText( 'triggerChildDispatch' ) );
 
 			expect( selectCount1AndDep ).toHaveBeenCalledTimes( 3 );
 			expect( screen.getByRole( 'status' ) ).toHaveTextContent(
@@ -1148,7 +1151,9 @@ describe( 'useSelect', () => {
 	} );
 
 	describe( 'static store selection mode', () => {
-		it( 'can read the current value from store', () => {
+		it( 'can read the current value from store', async () => {
+			const user = userEvent.setup();
+
 			registry.registerStore( 'testStore', {
 				reducer: ( s = 0, a ) => ( a.type === 'INC' ? s + 1 : s ),
 				actions: { inc: () => ( { type: 'INC' } ) },
@@ -1170,13 +1175,13 @@ describe( 'useSelect', () => {
 				</RegistryProvider>
 			);
 
-			fireEvent.click( screen.getByRole( 'button' ) );
+			await user.click( screen.getByRole( 'button' ) );
 			expect( record ).toHaveBeenLastCalledWith( 0 );
 
 			// no need to act() as the component doesn't react to the updates
 			registry.dispatch( 'testStore' ).inc();
 
-			fireEvent.click( screen.getByRole( 'button' ) );
+			await user.click( screen.getByRole( 'button' ) );
 			expect( record ).toHaveBeenLastCalledWith( 1 );
 		} );
 	} );