diff --git a/dom/workers/test/serviceworkers/controller/index.html b/dom/workers/test/serviceworkers/controller/index.html
index 07a7f326c8ed..452adeecb886 100644
--- a/dom/workers/test/serviceworkers/controller/index.html
+++ b/dom/workers/test/serviceworkers/controller/index.html
@@ -17,11 +17,11 @@
 
   // Make sure to use good, unique messages, since the actual expression will not show up in test results.
   function my_ok(result, msg) {
-    parent.postMessage({status: "ok", result: result, message: msg}, "*");
+    window.opener.postMessage({status: "ok", result: result, message: msg}, "*");
   }
 
   function finish() {
-    parent.postMessage({status: "done"}, "*");
+    window.opener.postMessage({status: "done"}, "*");
   }
 
   navigator.serviceWorker.ready.then(function(swr) {
diff --git a/dom/workers/test/serviceworkers/test_controller.html b/dom/workers/test/serviceworkers/test_controller.html
index 07ecc16b92cf..b766bbfcc30f 100644
--- a/dom/workers/test/serviceworkers/test_controller.html
+++ b/dom/workers/test/serviceworkers/test_controller.html
@@ -15,9 +15,6 @@
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
-  var content;
-  var iframe;
-
   function simpleRegister() {
     // We use the control scope for the less specific registration. The window will register a worker on controller/
     return navigator.serviceWorker.register("worker.js", { scope: "./control" });
@@ -30,23 +27,17 @@
           ok(e.data.result, e.data.message);
         } else if (e.data.status == "done") {
           window.onmessage = null;
-          content.removeChild(iframe);
+          w.close();
           resolve();
         }
       }
     });
 
-    content = document.getElementById("content");
-    ok(content, "Parent exists.");
-
-    iframe = document.createElement("iframe");
-    iframe.setAttribute('src', "controller/index.html");
-    content.appendChild(iframe);
-
+    var w = window.open("controller/index.html");
     return p;
   }
 
-  // This document just flips the prefs and opens the iframe for the actual test.
+  // This document just flips the prefs and opens the window for the actual test.
   function runTest() {
     simpleRegister()
       .then(testController)