diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index 37a0397862..54d5737adb 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -43,7 +43,7 @@
     "@backstage/dev-utils": "^0.1.1-alpha.9",
     "@backstage/test-utils": "^0.1.1-alpha.9",
     "@testing-library/jest-dom": "^5.7.0",
-    "@testing-library/react": "^10.2.1",
+    "@testing-library/react": "^9.3.2",
     "@testing-library/react-hooks": "^3.3.0",
     "@testing-library/user-event": "^10.2.4",
     "@types/jest": "^25.2.2",
diff --git a/plugins/catalog/src/components/CatalogFilter/CatalogFilter.test.tsx b/plugins/catalog/src/components/CatalogFilter/CatalogFilter.test.tsx
index f7143f73a2..cc4cc62fdb 100644
--- a/plugins/catalog/src/components/CatalogFilter/CatalogFilter.test.tsx
+++ b/plugins/catalog/src/components/CatalogFilter/CatalogFilter.test.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { render, fireEvent, waitFor, screen } from '@testing-library/react';
+import { render, fireEvent } from '@testing-library/react';
 import { wrapInTestApp } from '@backstage/test-utils';
 import { CatalogFilter, CatalogFilterGroup } from './CatalogFilter';
 import { EntityGroup } from '../../data/filters';
@@ -124,7 +124,7 @@ describe('Catalog Filter', () => {
       },
     ];
 
-    render(
+    const { getAllByText } = render(
       wrapInTestApp(
         <CatalogFilter {...defaultFilterProps} groups={mockGroups} />,
       ),
@@ -134,10 +134,8 @@ describe('Catalog Filter', () => {
       const matcher = new RegExp(
         `(${defaultFilterProps.entitiesByFilter[key as EntityGroup].length})`,
       );
-      await waitFor(() => screen.getAllByText(matcher));
-      screen
-        .getAllByText(matcher)
-        .forEach(el => expect(el).toBeInTheDocument());
+      const items = await getAllByText(matcher);
+      items.forEach(el => expect(el).toBeInTheDocument());
     }
   });
 
diff --git a/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx b/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx
index a11ff8e2a6..7ba1c39bb7 100644
--- a/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx
+++ b/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx
@@ -24,7 +24,7 @@ import {
   identityApiRef,
 } from '@backstage/core';
 import { MockErrorApi, wrapInTestApp } from '@backstage/test-utils';
-import { screen, render, fireEvent, waitFor } from '@testing-library/react';
+import { render, fireEvent } from '@testing-library/react';
 import React from 'react';
 import { catalogApiRef } from '../..';
 import { CatalogApi } from '../../api/types';
@@ -70,7 +70,7 @@ describe('CatalogPage', () => {
   // related to some theme issues in mui-table
   // https://github.com/mbrn/material-table/issues/1293
   it('should render', async () => {
-    render(
+    const { findByText } = render(
       wrapInTestApp(
         <ApiProvider
           apis={ApiRegistry.from([
@@ -84,11 +84,12 @@ describe('CatalogPage', () => {
         </ApiProvider>,
       ),
     );
-    await waitFor(() => screen.getByText(/All Services \(2\)/));
-    expect(screen.getByText(/All Services \(2\)/)).toBeInTheDocument();
+
+    const items = await findByText(/All Services \(2\)/);
+    expect(items).toBeInTheDocument();
   });
   it('should filter by owner', async () => {
-    render(
+    const { findByText, getByText } = render(
       wrapInTestApp(
         <ApiProvider
           apis={ApiRegistry.from([
@@ -102,8 +103,8 @@ describe('CatalogPage', () => {
         </ApiProvider>,
       ),
     );
-    fireEvent.click(screen.getByText(/Owned/));
-    await waitFor(() => screen.getByText(/Owned \(1\)/));
-    expect(screen.getByText(/Owned \(1\)/)).toBeInTheDocument();
+    fireEvent.click(getByText(/Owned/));
+    const items = await findByText(/Owned \(1\)/);
+    expect(items).toBeInTheDocument();
   });
 });
diff --git a/yarn.lock b/yarn.lock
index a8b1cfb937..b3b0af2615 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -891,7 +891,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.10.2", "@babel/runtime@^7.5.4":
+"@babel/runtime@^7.5.4":
   version "7.10.2"
   resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839"
   integrity sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==
@@ -3285,16 +3285,6 @@
     dom-accessibility-api "^0.4.2"
     pretty-format "^25.1.0"
 
-"@testing-library/dom@^7.9.0":
-  version "7.16.1"
-  resolved "https://registry.npmjs.org/@testing-library/dom/-/dom-7.16.1.tgz#a6881d53612f2e8f7bcc0e0bd8825c6788cf57f2"
-  integrity sha512-u0Ck7tjWDyCcGn+f77JbUHa7PqgFu62ohRxegj1/H5P3REKsM+2roCvcnWJjMSHvK354NAS/Pgi92E9z6cB7Sw==
-  dependencies:
-    "@babel/runtime" "^7.10.2"
-    aria-query "^4.0.2"
-    dom-accessibility-api "^0.4.5"
-    pretty-format "^25.5.0"
-
 "@testing-library/jest-dom@^5.7.0":
   version "5.9.0"
   resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.9.0.tgz#86464c66cbe75e632b8adb636f539bfd0efc2c9c"
@@ -3318,14 +3308,6 @@
     "@babel/runtime" "^7.5.4"
     "@types/testing-library__react-hooks" "^3.0.0"
 
-"@testing-library/react@^10.2.1":
-  version "10.2.1"
-  resolved "https://registry.npmjs.org/@testing-library/react/-/react-10.2.1.tgz#f0c5ac9072ad54c29672150943f35d6617263f26"
-  integrity sha512-pv2jZhiZgN1/alz1aImhSasZAOPg3er2Kgcfg9fzuw7aKPLxVengqqR1n0CJANeErR1DqORauQaod+gGUgAJOQ==
-  dependencies:
-    "@babel/runtime" "^7.10.2"
-    "@testing-library/dom" "^7.9.0"
-
 "@testing-library/react@^9.3.2":
   version "9.5.0"
   resolved "https://registry.npmjs.org/@testing-library/react/-/react-9.5.0.tgz#71531655a7890b61e77a1b39452fbedf0472ca5e"
@@ -7716,11 +7698,6 @@ dom-accessibility-api@^0.4.2:
   resolved "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.4.3.tgz#93ca9002eb222fd5a343b6e5e6b9cf5929411c4c"
   integrity sha512-JZ8iPuEHDQzq6q0k7PKMGbrIdsgBB7TRrtVOUm4nSMCExlg5qQG4KXWTH2k90yggjM4tTumRGwTKJSldMzKyLA==
 
-dom-accessibility-api@^0.4.5:
-  version "0.4.5"
-  resolved "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.4.5.tgz#d9c1cefa89f509d8cf132ab5d250004d755e76e3"
-  integrity sha512-HcPDilI95nKztbVikaN2vzwvmv0sE8Y2ZJFODy/m15n7mGXLeOKGiys9qWVbFbh+aq/KYj2lqMLybBOkYAEXqg==
-
 dom-converter@^0.2:
   version "0.2.0"
   resolved "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"