diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.test.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.test.tsx
index aac54e084a..0a6960cdc7 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.test.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.test.tsx
@@ -15,9 +15,8 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { ApiProvider } from '@backstage/core-app-api';
 import { configApiRef } from '@backstage/core-plugin-api';
-import { TestApiRegistry, MockConfigApi } from '@backstage/test-utils';
+import { MockConfigApi, TestApiProvider } from '@backstage/test-utils';
 import { makeStyles } from '@material-ui/core';
 import { render, screen } from '@testing-library/react';
 import { renderHook } from '@testing-library/react-hooks';
@@ -48,18 +47,17 @@ const entities: Entity[] = [
 ];
 
 const mockConfigApi = new MockConfigApi({});
-
-const apis = TestApiRegistry.from([configApiRef, mockConfigApi]);
+const apis = [[configApiRef, mockConfigApi]] as const;
 
 describe('<PreviewCatalogInfoComponent />', () => {
   it('renders without exploding', () => {
     render(
-      <ApiProvider apis={apis}>
+      <TestApiProvider apis={apis}>
         <PreviewCatalogInfoComponent
           repositoryUrl="http://my-repository/a/"
           entities={entities}
         />
-      </ApiProvider>,
+      </TestApiProvider>,
     );
 
     const repositoryUrl = screen.getByText(
@@ -76,13 +74,13 @@ describe('<PreviewCatalogInfoComponent />', () => {
     const { result } = renderHook(() => useStyles());
 
     render(
-      <ApiProvider apis={apis}>
+      <TestApiProvider apis={apis}>
         <PreviewCatalogInfoComponent
           repositoryUrl="http://my-repository/a/"
           entities={entities}
           classes={{ card: result.current.displayNone }}
         />
-      </ApiProvider>,
+      </TestApiProvider>,
     );
 
     const repositoryUrl = screen.getByText(
@@ -99,13 +97,13 @@ describe('<PreviewCatalogInfoComponent />', () => {
     const { result } = renderHook(() => useStyles());
 
     render(
-      <ApiProvider apis={apis}>
+      <TestApiProvider apis={apis}>
         <PreviewCatalogInfoComponent
           repositoryUrl="http://my-repository/a/"
           entities={entities}
           classes={{ cardContent: result.current.displayNone }}
         />
-      </ApiProvider>,
+      </TestApiProvider>,
     );
 
     const repositoryUrl = screen.getByText(
@@ -120,23 +118,25 @@ describe('<PreviewCatalogInfoComponent />', () => {
 
   it('renders with custom catalog filename', () => {
     render(
-      <ApiProvider
-        apis={TestApiRegistry.from([
-          configApiRef,
-          new MockConfigApi({
-            catalog: {
-              import: {
-                entityFilename: 'anvil.yaml',
+      <TestApiProvider
+        apis={[
+          [
+            configApiRef,
+            new MockConfigApi({
+              catalog: {
+                import: {
+                  entityFilename: 'anvil.yaml',
+                },
               },
-            },
-          }),
-        ])}
+            }),
+          ],
+        ]}
       >
         <PreviewCatalogInfoComponent
           repositoryUrl="http://acme-corp/awesome-api/"
           entities={entities}
         />
-      </ApiProvider>,
+      </TestApiProvider>,
     );
 
     const repositoryUrl = screen.getByText(