diff --git a/.eslintrc.js b/.eslintrc.js
index 0d937fc6b4..2df965ab73 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -45,13 +45,12 @@ module.exports = {
           "CallExpression[arguments.length=0] > MemberExpression[property.name='toUpperCase']",
       },
     ],
-    'testing-library/await-async-query': 'error',
+    'testing-library/await-async-queries': 'error',
     'testing-library/await-async-utils': 'error',
-    'testing-library/no-await-sync-query': 'error',
-    'testing-library/prefer-wait-for': 'error',
+    'testing-library/no-await-sync-queries': 'error',
     'testing-library/no-dom-import': 'error',
     'testing-library/no-wait-for-side-effects': 'error',
-    'testing-library/no-wait-for-empty-callback': 'error',
+    'testing-library/await-async-events': 'error',
     'no-restricted-globals': [
       'error',
       [
diff --git a/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx
index 85a477801a..d8bd8f11a6 100644
--- a/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx
+++ b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx
@@ -66,12 +66,12 @@ describe('<EntityPeekAheadPopover/>', () => {
     );
     expect(screen.getByText('s1')).toBeInTheDocument();
     expect(screen.queryByText('service1')).toBeNull();
-    user.hover(screen.getByTestId('popover1'));
+    await user.hover(screen.getByTestId('popover1'));
     expect(await screen.findByText('service1')).toBeInTheDocument();
 
     expect(screen.getByText('s2')).toBeInTheDocument();
     expect(screen.queryByText('service2')).toBeNull();
-    user.hover(screen.getByTestId('popover2'));
+    await user.hover(screen.getByTestId('popover2'));
     expect(
       await screen.findByText('Error: component:default/service2 not found'),
     ).toBeInTheDocument();
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
index edef7cec5c..d91f3bf3a2 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
@@ -134,7 +134,7 @@ export async function createGithubRepoWithCollaboratorsAndTopics(
   secrets: { [key: string]: string } | undefined,
   logger: Logger,
 ) {
-  // eslint-disable-next-line testing-library/no-await-sync-query
+  // eslint-disable-next-line testing-library/no-await-sync-queries
   const user = await client.rest.users.getByUsername({
     username: owner,
   });
@@ -409,7 +409,7 @@ async function validateAccessTeam(client: Octokit, access: string) {
   try {
     // Below rule disabled because of a 'getByName' check for a different library
     // incorrectly triggers here.
-    // eslint-disable-next-line testing-library/no-await-sync-query
+    // eslint-disable-next-line testing-library/no-await-sync-queries
     await client.rest.teams.getByName({
       org,
       team_slug,