diff --git a/.changeset/tall-parents-deny.md b/.changeset/tall-parents-deny.md
index db56810386..856a43a1ab 100644
--- a/.changeset/tall-parents-deny.md
+++ b/.changeset/tall-parents-deny.md
@@ -10,12 +10,11 @@ import {
   MockSearchApi,
   SearchContextProvider,
 } from '@backstage/plugin-search-react';
-import { ApiProvider } from '@backstage/core-app-api';
-import { TestApiRegistry } from '@backstage/test-utils';
+import { TestApiProvider } from '@backstage/test-utils';
 
-<ApiProvider apis={TestApiRegistry.from([searchApiRef, new MockSearchApi()])}>
+<TestApiProvider apis={[[searchApiRef, new MockSearchApi()]]}>
   <SearchContextProvider>
     <Component />
   </SearchContextProvider>
-</ApiProvider>;
+</TestApiProvider>;
 ```
diff --git a/plugins/search/src/components/SearchBar/SearchBar.stories.tsx b/plugins/search/src/components/SearchBar/SearchBar.stories.tsx
index 1340bb7dc3..9728101e97 100644
--- a/plugins/search/src/components/SearchBar/SearchBar.stories.tsx
+++ b/plugins/search/src/components/SearchBar/SearchBar.stories.tsx
@@ -21,8 +21,7 @@ import {
   MockSearchApi,
   SearchContextProvider,
 } from '@backstage/plugin-search-react';
-import { ApiProvider } from '@backstage/core-app-api';
-import { TestApiRegistry } from '@backstage/test-utils';
+import { TestApiProvider } from '@backstage/test-utils';
 import { SearchBar } from './SearchBar';
 
 export default {
@@ -30,9 +29,7 @@ export default {
   component: SearchBar,
   decorators: [
     (Story: ComponentType<{}>) => (
-      <ApiProvider
-        apis={TestApiRegistry.from([searchApiRef, new MockSearchApi()])}
-      >
+      <TestApiProvider apis={[[searchApiRef, new MockSearchApi()]]}>
         <SearchContextProvider>
           <Grid container direction="row">
             <Grid item xs={12}>
@@ -40,7 +37,7 @@ export default {
             </Grid>
           </Grid>
         </SearchContextProvider>
-      </ApiProvider>
+      </TestApiProvider>
     ),
   ],
 };
diff --git a/plugins/search/src/components/SearchFilter/SearchFilter.stories.tsx b/plugins/search/src/components/SearchFilter/SearchFilter.stories.tsx
index c7111a52f2..7e8a7d585a 100644
--- a/plugins/search/src/components/SearchFilter/SearchFilter.stories.tsx
+++ b/plugins/search/src/components/SearchFilter/SearchFilter.stories.tsx
@@ -21,8 +21,7 @@ import {
   MockSearchApi,
   SearchContextProvider,
 } from '@backstage/plugin-search-react';
-import { ApiProvider } from '@backstage/core-app-api';
-import { TestApiRegistry } from '@backstage/test-utils';
+import { TestApiProvider } from '@backstage/test-utils';
 import { SearchFilter } from './SearchFilter';
 
 export default {
@@ -30,9 +29,7 @@ export default {
   component: SearchFilter,
   decorators: [
     (Story: ComponentType<{}>) => (
-      <ApiProvider
-        apis={TestApiRegistry.from([searchApiRef, new MockSearchApi()])}
-      >
+      <TestApiProvider apis={[[searchApiRef, new MockSearchApi()]]}>
         <SearchContextProvider>
           <Grid container direction="row">
             <Grid item xs={4}>
@@ -40,7 +37,7 @@ export default {
             </Grid>
           </Grid>
         </SearchContextProvider>
-      </ApiProvider>
+      </TestApiProvider>
     ),
   ],
 };
diff --git a/plugins/search/src/components/SearchModal/SearchModal.stories.tsx b/plugins/search/src/components/SearchModal/SearchModal.stories.tsx
index 2e70b2d6d3..a4e92f53ec 100644
--- a/plugins/search/src/components/SearchModal/SearchModal.stories.tsx
+++ b/plugins/search/src/components/SearchModal/SearchModal.stories.tsx
@@ -34,8 +34,7 @@ import {
   MockSearchApi,
   SearchContextProvider,
 } from '@backstage/plugin-search-react';
-import { ApiProvider } from '@backstage/core-app-api';
-import { TestApiRegistry } from '@backstage/test-utils';
+import { TestApiProvider } from '@backstage/test-utils';
 import { SearchModal } from './SearchModal';
 import { SearchResult } from '../SearchResult';
 import { SearchResultPager } from '../SearchResultPager';
@@ -77,16 +76,14 @@ export default {
   decorators: [
     (Story: ComponentType<{}>) =>
       wrapInTestApp(
-        <ApiProvider
-          apis={TestApiRegistry.from([
-            searchApiRef,
-            new MockSearchApi(mockResults),
-          ])}
+        <TestApiProvider
+          apis={[[searchApiRef, new MockSearchApi(mockResults)]]}
         >
           <SearchContextProvider>
             <Story />
           </SearchContextProvider>
-        </ApiProvider>,
+        </TestApiProvider>,
+
         { mountedRoutes: { '/search': rootRouteRef } },
       ),
   ],
diff --git a/plugins/search/src/components/SearchResult/SearchResult.stories.tsx b/plugins/search/src/components/SearchResult/SearchResult.stories.tsx
index 0bf894b860..207f1ae1d7 100644
--- a/plugins/search/src/components/SearchResult/SearchResult.stories.tsx
+++ b/plugins/search/src/components/SearchResult/SearchResult.stories.tsx
@@ -26,8 +26,7 @@ import {
   SearchContextProvider,
 } from '@backstage/plugin-search-react';
 import { SearchResult } from './SearchResult';
-import { TestApiRegistry } from '@backstage/test-utils';
-import { ApiProvider } from '@backstage/core-app-api';
+import { TestApiProvider } from '@backstage/test-utils';
 
 const mockResults = {
   results: [
@@ -64,16 +63,13 @@ export default {
   decorators: [
     (Story: ComponentType<{}>) => (
       <MemoryRouter>
-        <ApiProvider
-          apis={TestApiRegistry.from([
-            searchApiRef,
-            new MockSearchApi(mockResults),
-          ])}
+        <TestApiProvider
+          apis={[[searchApiRef, new MockSearchApi(mockResults)]]}
         >
           <SearchContextProvider>
             <Story />
           </SearchContextProvider>
-        </ApiProvider>
+        </TestApiProvider>
       </MemoryRouter>
     ),
   ],
diff --git a/plugins/search/src/components/SearchType/SearchType.stories.tsx b/plugins/search/src/components/SearchType/SearchType.stories.tsx
index e98655b684..415eee19a6 100644
--- a/plugins/search/src/components/SearchType/SearchType.stories.tsx
+++ b/plugins/search/src/components/SearchType/SearchType.stories.tsx
@@ -20,8 +20,7 @@ import DocsIcon from '@material-ui/icons/Description';
 import UsersGroupsIcon from '@material-ui/icons/Person';
 import React, { ComponentType } from 'react';
 import { SearchType } from './SearchType';
-import { ApiProvider } from '@backstage/core-app-api';
-import { TestApiRegistry } from '@backstage/test-utils';
+import { TestApiProvider } from '@backstage/test-utils';
 import {
   searchApiRef,
   MockSearchApi,
@@ -33,9 +32,7 @@ export default {
   component: SearchType,
   decorators: [
     (Story: ComponentType<{}>) => (
-      <ApiProvider
-        apis={TestApiRegistry.from([searchApiRef, new MockSearchApi()])}
-      >
+      <TestApiProvider apis={[[searchApiRef, new MockSearchApi()]]}>
         <SearchContextProvider>
           <Grid container direction="row">
             <Grid item xs={4}>
@@ -43,7 +40,7 @@ export default {
             </Grid>
           </Grid>
         </SearchContextProvider>
-      </ApiProvider>
+      </TestApiProvider>
     ),
   ],
 };