diff --git a/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap b/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap
index cd0884fa65fea..4a094a5eb33d2 100644
--- a/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap
+++ b/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap
@@ -1,10 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`home change home route should render a link to change the default route in advanced settings if advanced settings is enabled 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "homPageHeader null",
       "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
@@ -13,6 +12,7 @@ exports[`home change home route should render a link to change the default route
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <EuiFlexGroup
     className="homData homData--expanded"
@@ -40,14 +40,13 @@ exports[`home change home route should render a link to change the default route
     onSetDefaultRoute={[Function]}
     path="/app/home"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`home directories should not render directory entry when showOnHomePage is false 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "homPageHeader null",
       "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
@@ -56,6 +55,7 @@ exports[`home directories should not render directory entry when showOnHomePage
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <EuiFlexGroup
     className="homData homData--expanded"
@@ -83,14 +83,13 @@ exports[`home directories should not render directory entry when showOnHomePage
     onSetDefaultRoute={[Function]}
     path="/app/home"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`home directories should render ADMIN directory entry in "Manage your data" panel 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "homPageHeader null",
       "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
@@ -99,6 +98,7 @@ exports[`home directories should render ADMIN directory entry in "Manage your da
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <EuiFlexGroup
     className="homData homData--expanded"
@@ -138,14 +138,13 @@ exports[`home directories should render ADMIN directory entry in "Manage your da
     onSetDefaultRoute={[Function]}
     path="/app/home"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`home directories should render DATA directory entry in "Ingest your data" panel 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "homPageHeader null",
       "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
@@ -154,6 +153,7 @@ exports[`home directories should render DATA directory entry in "Ingest your dat
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <EuiFlexGroup
     className="homData homData--expanded"
@@ -193,14 +193,13 @@ exports[`home directories should render DATA directory entry in "Ingest your dat
     onSetDefaultRoute={[Function]}
     path="/app/home"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`home directories should render solutions in the "solution section" 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "homPageHeader  homPageHeader--hasOverlap",
       "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
@@ -209,6 +208,7 @@ exports[`home directories should render solutions in the "solution section" 1`]
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <SolutionsSection
     addBasePath={[Function]}
@@ -288,14 +288,13 @@ exports[`home directories should render solutions in the "solution section" 1`]
     onSetDefaultRoute={[Function]}
     path="/app/home"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`home header render 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "homPageHeader null",
       "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
@@ -304,6 +303,7 @@ exports[`home header render 1`] = `
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <EuiFlexGroup
     className="homData homData--expanded"
@@ -331,14 +331,13 @@ exports[`home header render 1`] = `
     onSetDefaultRoute={[Function]}
     path="/app/home"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`home header should show "Dev tools" link if console is available 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "homPageHeader null",
       "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
@@ -347,6 +346,7 @@ exports[`home header should show "Dev tools" link if console is available 1`] =
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <EuiFlexGroup
     className="homData homData--expanded"
@@ -386,14 +386,13 @@ exports[`home header should show "Dev tools" link if console is available 1`] =
     onSetDefaultRoute={[Function]}
     path="/app/home"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`home header should show "Manage" link if stack management is available 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "homPageHeader null",
       "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
@@ -402,6 +401,7 @@ exports[`home header should show "Manage" link if stack management is available
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <EuiFlexGroup
     className="homData homData--expanded"
@@ -429,14 +429,13 @@ exports[`home header should show "Manage" link if stack management is available
     onSetDefaultRoute={[Function]}
     path="/app/home"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`home isNewKibanaInstance should safely handle execeptions 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "homPageHeader null",
       "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
@@ -445,6 +444,7 @@ exports[`home isNewKibanaInstance should safely handle execeptions 1`] = `
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <EuiFlexGroup
     className="homData homData--expanded"
@@ -472,14 +472,13 @@ exports[`home isNewKibanaInstance should safely handle execeptions 1`] = `
     onSetDefaultRoute={[Function]}
     path="/app/home"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`home isNewKibanaInstance should set isNewKibanaInstance to false when there are index patterns 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "homPageHeader null",
       "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
@@ -488,6 +487,7 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to false when t
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <EuiFlexGroup
     className="homData homData--expanded"
@@ -515,14 +515,13 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to false when t
     onSetDefaultRoute={[Function]}
     path="/app/home"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`home isNewKibanaInstance should set isNewKibanaInstance to true when there are no index patterns 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "homPageHeader null",
       "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
@@ -531,6 +530,7 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to true when th
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <EuiFlexGroup
     className="homData homData--expanded"
@@ -558,14 +558,13 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to true when th
     onSetDefaultRoute={[Function]}
     path="/app/home"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`home should render home component 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "homPageHeader null",
       "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
@@ -574,6 +573,7 @@ exports[`home should render home component 1`] = `
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <EuiFlexGroup
     className="homData homData--expanded"
@@ -601,14 +601,13 @@ exports[`home should render home component 1`] = `
     onSetDefaultRoute={[Function]}
     path="/app/home"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`home welcome should show the normal home page if loading fails 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "homPageHeader null",
       "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
@@ -617,6 +616,7 @@ exports[`home welcome should show the normal home page if loading fails 1`] = `
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <EuiFlexGroup
     className="homData homData--expanded"
@@ -644,14 +644,13 @@ exports[`home welcome should show the normal home page if loading fails 1`] = `
     onSetDefaultRoute={[Function]}
     path="/app/home"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`home welcome should show the normal home page if welcome screen is disabled locally 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "homPageHeader null",
       "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
@@ -660,6 +659,7 @@ exports[`home welcome should show the normal home page if welcome screen is disa
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <EuiFlexGroup
     className="homData homData--expanded"
@@ -687,7 +687,7 @@ exports[`home welcome should show the normal home page if welcome screen is disa
     onSetDefaultRoute={[Function]}
     path="/app/home"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`home welcome should show the welcome screen if enabled, and there are no index patterns defined 1`] = `
@@ -698,10 +698,9 @@ exports[`home welcome should show the welcome screen if enabled, and there are n
 `;
 
 exports[`home welcome stores skip welcome setting if skipped 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "homPageHeader null",
       "pageTitle": <FormattedMessage
         defaultMessage="Home"
         id="home.header.title"
@@ -710,6 +709,7 @@ exports[`home welcome stores skip welcome setting if skipped 1`] = `
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <EuiFlexGroup
     className="homData homData--expanded"
@@ -737,5 +737,5 @@ exports[`home welcome stores skip welcome setting if skipped 1`] = `
     onSetDefaultRoute={[Function]}
     path="/app/home"
   />
-</EuiPageTemplate>
+</Component>
 `;
diff --git a/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap b/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
index b4d621c2ee7f6..a32e27050fad1 100644
--- a/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
+++ b/src/plugins/kibana_overview/public/components/overview/__snapshots__/overview.test.tsx.snap
@@ -1,10 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Overview render 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "kbnPageHeader",
       "iconType": "logoKibana",
       "pageTitle": <FormattedMessage
         defaultMessage="Kibana"
@@ -14,6 +13,7 @@ exports[`Overview render 1`] = `
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <section
     aria-labelledby="kbnOverviewApps__title"
@@ -298,14 +298,13 @@ exports[`Overview render 1`] = `
     onSetDefaultRoute={[Function]}
     path="/app/kibana_overview"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`Overview without features 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "kbnPageHeader",
       "iconType": "logoKibana",
       "pageTitle": <FormattedMessage
         defaultMessage="Kibana"
@@ -315,6 +314,7 @@ exports[`Overview without features 1`] = `
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <section
     aria-labelledby="kbnOverviewApps__title"
@@ -655,14 +655,13 @@ exports[`Overview without features 1`] = `
     onSetDefaultRoute={[Function]}
     path="/app/kibana_overview"
   />
-</EuiPageTemplate>
+</Component>
 `;
 
 exports[`Overview without solutions 1`] = `
-<EuiPageTemplate
+<Component
   pageHeader={
     Object {
-      "className": "kbnPageHeader",
       "iconType": "logoKibana",
       "pageTitle": <FormattedMessage
         defaultMessage="Kibana"
@@ -672,6 +671,7 @@ exports[`Overview without solutions 1`] = `
       "rightSideItems": Array [],
     }
   }
+  template="empty"
 >
   <section
     aria-labelledby="kbnOverviewApps__title"
@@ -969,5 +969,5 @@ exports[`Overview without solutions 1`] = `
     onSetDefaultRoute={[Function]}
     path="/app/kibana_overview"
   />
-</EuiPageTemplate>
+</Component>
 `;