diff --git a/test/integration/test-shadow-amp.js b/test/integration/test-shadow-amp.js
index c036fd67b72cb..7f8b6e5922cde 100644
--- a/test/integration/test-shadow-amp.js
+++ b/test/integration/test-shadow-amp.js
@@ -20,22 +20,20 @@ describes.integration(
   {
     amp: false,
     body: `
-    <script async src='/dist/amp-shadow.js'></script>
-    <div id="host"></div>
-    <script>
-      window.addEventListener('DOMContentLoaded', () => {
+      <div id="host"></div>
+      <script>
         (window.AMP = window.AMP || []).push(() => {
-          window.ampShadowHost = document.getElementById('host');
+          const host = document.getElementById('host');
           const testUrl = 'http://localhost:9876/amp4test/shadow-amp';
           fetch(testUrl)
             .then(res => res.text())
             .then(text => {
               const doc = new DOMParser().parseFromString(text, 'text/html');
-              AMP.attachShadowDoc(window.ampShadowHost, doc, testUrl);
+              AMP.attachShadowDoc(host, doc, testUrl);
             });
         });
-      });
-    </script>
+      </script>
+      <script async src='/dist/amp-shadow.js'></script>
     `,
   },
   env => {
@@ -44,8 +42,8 @@ describes.integration(
 
     beforeEach(async () => {
       docController = new BrowserController(env.win);
-      await docController.waitForShadowRoot('#host');
-      shadowDoc = env.win.ampShadowHost.shadowRoot;
+      await docController.waitForShadowRoot('#host', 25000);
+      shadowDoc = env.win.document.getElementById('host').shadowRoot;
     });
 
     it('should attach shadow AMP document', () => {
diff --git a/testing/describes.js b/testing/describes.js
index def0c6fc2ba27..4fa4184a104ec 100644
--- a/testing/describes.js
+++ b/testing/describes.js
@@ -476,7 +476,7 @@ class IntegrationFixture {
     /** @const */
     this.spec = spec;
     if (this.spec.timeout === undefined) {
-      this.spec.timeout = 15000;
+      this.spec.timeout = 25000;
     }
     if (this.spec.retryOnSaucelabs === undefined) {
       this.spec.retryOnSaucelabs = 4;