diff --git a/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx b/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx
index df7fcc1cd2..d4cd6e7606 100644
--- a/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx
+++ b/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx
@@ -17,15 +17,26 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import CatalogPage from './CatalogPage';
-import { ThemeProvider } from '@material-ui/core';
-import { lightTheme } from '@backstage/theme';
+import { ApiRegistry, ApiProvider, errorApiRef } from '@backstage/core';
+import { wrapInTheme } from '@backstage/test-utils';
+import { catalogApiRef } from '../..';
+
+const errorApi = { post: () => {} };
+const catalogApi = { getEntities: () => Promise.resolve([{ kind: '' }]) };
 
 describe('CatalogPage', () => {
   it('should render', async () => {
     const rendered = render(
-      <ThemeProvider theme={lightTheme}>
-        <CatalogPage />
-      </ThemeProvider>,
+      wrapInTheme(
+        <ApiProvider
+          apis={ApiRegistry.from([
+            [errorApiRef, errorApi],
+            [catalogApiRef, catalogApi],
+          ])}
+        >
+          <CatalogPage />
+        </ApiProvider>,
+      ),
     );
     expect(
       await rendered.findByText('Keep track of your software'),
diff --git a/plugins/catalog/src/components/ComponentPage/ComponentPage.test.tsx b/plugins/catalog/src/components/ComponentPage/ComponentPage.test.tsx
index d0f67d9cb3..0430fb7d3c 100644
--- a/plugins/catalog/src/components/ComponentPage/ComponentPage.test.tsx
+++ b/plugins/catalog/src/components/ComponentPage/ComponentPage.test.tsx
@@ -17,7 +17,6 @@ import ComponentPage from './ComponentPage';
 import { render } from '@testing-library/react';
 import * as React from 'react';
 import { wrapInTheme } from '@backstage/test-utils';
-import { act } from 'react-dom/test-utils';
 import { ApiProvider, ApiRegistry, errorApiRef } from '@backstage/core';
 
 const getTestProps = (componentName: string) => {