diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index 28fb012c12..931979d2d6 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -63,15 +63,19 @@ const CICDSwitcher = ({ entity }: { entity: Entity }) => {
 
 const OverviewContent = ({ entity }: { entity: Entity }) => (
   <Grid container spacing={3}>
-    <Grid item md={6}>
-      {isJenkinsAvailable(entity) && <JenkinsLatestRunCard branch="master" />}
-      {isGitHubActionsAvailable(entity) && (
-        <RecentWorkflowRunsCard entity={entity} />
-      )}
-    </Grid>
     <Grid item md={6}>
       <AboutCard entity={entity} />
     </Grid>
+    {isJenkinsAvailable(entity) && (
+      <Grid item md={6}>
+        <JenkinsLatestRunCard branch="master" />
+      </Grid>
+    )}
+    {isGitHubActionsAvailable(entity) && (
+      <Grid item md={6}>
+        <RecentWorkflowRunsCard entity={entity} />
+      </Grid>
+    )}
   </Grid>
 );
 
diff --git a/plugins/github-actions/src/components/Cards/RecentWorkflowRunsCard.test.tsx b/plugins/github-actions/src/components/Cards/RecentWorkflowRunsCard.test.tsx
index e5cb931ec1..1d6001e038 100644
--- a/plugins/github-actions/src/components/Cards/RecentWorkflowRunsCard.test.tsx
+++ b/plugins/github-actions/src/components/Cards/RecentWorkflowRunsCard.test.tsx
@@ -18,7 +18,7 @@ import type { Props as RecentWorkflowRunsCardProps } from './RecentWorkflowRunsC
 import React from 'react';
 import { render } from '@testing-library/react';
 import { RecentWorkflowRunsCard } from './RecentWorkflowRunsCard';
-import { useApi } from '@backstage/core-api';
+import { ApiProvider, ApiRegistry, errorApiRef } from '@backstage/core-api';
 import { useWorkflowRuns } from '../useWorkflowRuns';
 import { ThemeProvider } from '@material-ui/core';
 import { lightTheme } from '@backstage/theme';
@@ -27,7 +27,11 @@ import { MemoryRouter } from 'react-router';
 jest.mock('../useWorkflowRuns', () => ({
   useWorkflowRuns: jest.fn(),
 }));
-jest.mock('@backstage/core-api');
+
+const mockErrorApi: jest.Mocked<typeof errorApiRef.T> = {
+  post: jest.fn(),
+  error$: jest.fn(),
+};
 
 describe('<RecentWorkflowRunsCard />', () => {
   const entity = {
@@ -52,11 +56,9 @@ describe('<RecentWorkflowRunsCard />', () => {
     source: { branchName: `branch-${n}` },
     status: 'completed',
   }));
-  const mockErrorApi = { post: jest.fn() };
 
   beforeEach(() => {
     (useWorkflowRuns as jest.Mock).mockReturnValue([{ runs: workflowRuns }]);
-    (useApi as jest.Mock).mockReturnValue(mockErrorApi);
   });
 
   afterEach(() => {
@@ -67,7 +69,9 @@ describe('<RecentWorkflowRunsCard />', () => {
     render(
       <ThemeProvider theme={lightTheme}>
         <MemoryRouter>
-          <RecentWorkflowRunsCard {...props} />
+          <ApiProvider apis={ApiRegistry.with(errorApiRef, mockErrorApi)}>
+            <RecentWorkflowRunsCard {...props} />
+          </ApiProvider>
         </MemoryRouter>
       </ThemeProvider>,
     );