diff --git a/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.tsx.hbs b/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.tsx.hbs
index 5b15ab0c70..a050ccd2ec 100644
--- a/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.tsx.hbs
+++ b/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.tsx.hbs
@@ -5,7 +5,6 @@ import {
   InfoCard,
   Header,
   Page,
-  pageTheme,
   Content,
   ContentHeader,
   HeaderLabel,
diff --git a/packages/core/src/layout/Header/Header.stories.tsx b/packages/core/src/layout/Header/Header.stories.tsx
index cc0276224a..b902a709cf 100644
--- a/packages/core/src/layout/Header/Header.stories.tsx
+++ b/packages/core/src/layout/Header/Header.stories.tsx
@@ -41,9 +41,11 @@ export const Home = () => (
 );
 
 export const HomeWithSubtitle = () => (
-  <Header title="Start/Home Page" subtitle="This is a subtitle">
-    {labels}
-  </Header>
+  <Page pageTheme={customPageTheme.pageTheme.home}>
+    <Header title="Start/Home Page" subtitle="This is a subtitle">
+      {labels}
+    </Header>
+  </Page>
 );
 
 export const Tool = () => (
diff --git a/packages/core/src/layout/Header/Header.test.tsx b/packages/core/src/layout/Header/Header.test.tsx
index 5d28c6633f..00c5bfa2bd 100644
--- a/packages/core/src/layout/Header/Header.test.tsx
+++ b/packages/core/src/layout/Header/Header.test.tsx
@@ -15,8 +15,10 @@
  */
 
 import React from 'react';
-import { render } from '@testing-library/react';
+import { act, render, RenderResult } from '@testing-library/react';
 import { wrapInTestApp } from '@backstage/test-utils';
+import { ThemeProvider } from '@material-ui/core';
+import { customPageTheme } from '@backstage/theme';
 import { Header } from './Header';
 
 jest.mock('react-helmet', () => {
@@ -25,37 +27,73 @@ jest.mock('react-helmet', () => {
   };
 });
 
+const ThemeProviderWrapper: React.FC = ({ children }) => (
+  <ThemeProvider
+    theme={{
+      pageTheme: customPageTheme.pageTheme.home,
+      ...customPageTheme.baseTheme,
+    }}
+  >
+    {children}
+  </ThemeProvider>
+);
+
 describe('<Header/>', () => {
-  it('should render with title', () => {
-    const rendered = render(wrapInTestApp(<Header title="Title" />));
-    rendered.getByText('Title');
+  it('should render with title', async () => {
+    let rendered: RenderResult | undefined;
+    await act(async () => {
+      rendered = render(wrapInTestApp(<Header title="Title" />), {
+        wrapper: ThemeProviderWrapper,
+      });
+    });
+    rendered?.getByText('Title');
   });
 
-  it('should set document title', () => {
-    const rendered = render(wrapInTestApp(<Header title="Title1" />));
-    rendered.getByText('Title1');
-    rendered.getByText('defaultTitle: Title1 | Backstage');
+  it('should set document title', async () => {
+    let rendered: RenderResult | undefined;
+    await act(async () => {
+      rendered = render(wrapInTestApp(<Header title="Title1" />), {
+        wrapper: ThemeProviderWrapper,
+      });
+    });
+    rendered?.getByText('Title1');
+    rendered?.getByText('defaultTitle: Title1 | Backstage');
   });
 
-  it('should override document title', () => {
-    const rendered = render(
-      wrapInTestApp(<Header title="Title1" pageTitleOverride="Title2" />),
-    );
-    rendered.getByText('Title1');
-    rendered.getByText('defaultTitle: Title2 | Backstage');
+  it('should override document title', async () => {
+    let rendered: RenderResult | undefined;
+    await act(async () => {
+      rendered = render(
+        wrapInTestApp(<Header title="Title1" pageTitleOverride="Title2" />),
+        {
+          wrapper: ThemeProviderWrapper,
+        },
+      );
+    });
+    rendered?.getByText('Title1');
+    rendered?.getByText('defaultTitle: Title2 | Backstage');
   });
 
-  it('should have subtitle', () => {
-    const rendered = render(
-      wrapInTestApp(<Header title="Title" subtitle="Subtitle" />),
-    );
-    rendered.getByText('Subtitle');
+  it('should have subtitle', async () => {
+    let rendered: RenderResult | undefined;
+    await act(async () => {
+      rendered = render(
+        wrapInTestApp(<Header title="Title" subtitle="Subtitle" />),
+        {
+          wrapper: ThemeProviderWrapper,
+        },
+      );
+    });
+    rendered?.getByText('Subtitle');
   });
 
-  it('should have type rendered', () => {
-    const rendered = render(
-      wrapInTestApp(<Header title="Title" type="tool" />),
-    );
-    rendered.getByText('tool');
+  it('should have type rendered', async () => {
+    let rendered: RenderResult | undefined;
+    await act(async () => {
+      rendered = render(wrapInTestApp(<Header title="Title" type="tool" />), {
+        wrapper: ThemeProviderWrapper,
+      });
+    });
+    rendered?.getByText('tool');
   });
 });