diff --git a/dom/workers/test/serviceworkers/simpleregister/index.html b/dom/workers/test/serviceworkers/simpleregister/index.html
index 8f88c1b39ac..2c0eb5345ea 100644
--- a/dom/workers/test/serviceworkers/simpleregister/index.html
+++ b/dom/workers/test/serviceworkers/simpleregister/index.html
@@ -36,15 +36,6 @@
             }
           });
 
-          navigator.serviceWorker.getRegistration('http://mochi.test:8888/with_star/*')
-            .then(function(a) {
-            window.parent.postMessage({ type: "check", status: true,
-                                        msg: "getRegistration returns a ServiceWorkerRegistration" }, "*");
-            a.onupdatefound = function(e) {
-              eventReceived();
-            }
-          });
-
           navigator.serviceWorker.getRegistration('http://www.something_else.net/')
             .then(function(a) {
             window.parent.postMessage({ type: "check", status: false,
diff --git a/dom/workers/test/serviceworkers/test_scopes.html b/dom/workers/test/serviceworkers/test_scopes.html
index 464a9fd5e7b..51a0bd07329 100644
--- a/dom/workers/test/serviceworkers/test_scopes.html
+++ b/dom/workers/test/serviceworkers/test_scopes.html
@@ -16,7 +16,6 @@
 <script class="testbody" type="text/javascript">
 
   var scriptsAndScopes = [
-    [ "worker.js", "." ],
     [ "worker.js", "./sub/dir/"],
     [ "worker.js", "./sub/dir" ],
     [ "worker.js", "./sub/dir.html" ],
@@ -53,15 +52,24 @@
         return base + s;
       }
 
-      ok(getScope(p("index.html")) === p(""), "Scope should match");
-      ok(getScope(p("sua.html")) === p(""), "Scope should match");
+      function fail(fn) {
+        try {
+          getScope(p("index.html"));
+          ok(false, "No registration");
+        } catch(e) {
+          ok(true, "No registration");
+        }
+      }
+
       ok(getScope(p("sub.html")) === p("sub"), "Scope should match");
       ok(getScope(p("sub/dir.html")) === p("sub/dir.html"), "Scope should match");
       ok(getScope(p("sub/dir")) === p("sub/dir"), "Scope should match");
       ok(getScope(p("sub/dir/foo")) === p("sub/dir/"), "Scope should match");
       ok(getScope(p("sub/dir/afoo")) === p("sub/dir/a"), "Scope should match");
       ok(getScope(p("star*wars")) === p("star*"), "Scope should match");
-      ok(getScope(p("star/a.html")) === p(""), "Scope should match");
+      fail("index.html");
+      fail("sua.html");
+      fail("star/a.html");
       resolve();
     });
   }
diff --git a/dom/workers/test/serviceworkers/test_unregister.html b/dom/workers/test/serviceworkers/test_unregister.html
index 8cd48010841..a568b4e1311 100644
--- a/dom/workers/test/serviceworkers/test_unregister.html
+++ b/dom/workers/test/serviceworkers/test_unregister.html
@@ -16,8 +16,31 @@
 <script class="testbody" type="text/javascript">
 
   function simpleRegister() {
-        info("simpleRegister() just before calling register");
-    return navigator.serviceWorker.register("worker.js", { scope: "unregister/" });
+    return navigator.serviceWorker.register("worker.js", { scope: "unregister/" }).then(function(swr) {
+      if (swr.installing) {
+        return new Promise(function(resolve, reject) {
+          swr.installing.onstatechange = function(e) {
+            if (swr.waiting) {
+              swr.waiting.onstatechange = function(e) {
+                if (swr.active) {
+                  resolve();
+                } else if (swr.waiting && swr.waiting.state == "redundant") {
+                  reject("Should not go into redundant");
+                }
+              }
+            } else {
+              if (swr.active) {
+                resolve();
+              } else {
+                reject("No waiting and no active!");
+              }
+            }
+          }
+        });
+      } else {
+        return Promise.reject("Installing should be non-null");
+      }
+    });
   }
 
   function testControlled() {
@@ -49,6 +72,11 @@
   function unregister() {
     return navigator.serviceWorker.getRegistration("unregister/")
            .then(function(reg) {
+             if (!reg) {
+               info("Registration already removed");
+               return;
+             }
+
              info("getRegistration() succeeded " + reg.scope);
              return reg.unregister().then(function(v) {
                ok(v, "Unregister should resolve to true");
diff --git a/dom/workers/test/serviceworkers/test_workerUnregister.html b/dom/workers/test/serviceworkers/test_workerUnregister.html
index e300fcc58a2..9322b9ae0d9 100644
--- a/dom/workers/test/serviceworkers/test_workerUnregister.html
+++ b/dom/workers/test/serviceworkers/test_workerUnregister.html
@@ -14,7 +14,31 @@
 <script class="testbody" type="text/javascript">
 
   function simpleRegister() {
-    return navigator.serviceWorker.register("worker_unregister.js", { scope: "unregister/" });
+    return navigator.serviceWorker.register("worker_unregister.js", { scope: "unregister/" }).then(function(swr) {
+      if (swr.installing) {
+        return new Promise(function(resolve, reject) {
+          swr.installing.onstatechange = function(e) {
+            if (swr.waiting) {
+              swr.waiting.onstatechange = function(e) {
+                if (swr.active) {
+                  resolve();
+                } else if (swr.waiting && swr.waiting.state == "redundant") {
+                  reject("Should not go into redundant");
+                }
+              }
+            } else {
+              if (swr.active) {
+                resolve();
+              } else {
+                reject("No waiting and no active!");
+              }
+            }
+          }
+        });
+      } else {
+        return Promise.reject("Installing should be non-null");
+      }
+    });
   }
 
   function waitForMessages(sw) {
diff --git a/dom/workers/test/serviceworkers/unregister/index.html b/dom/workers/test/serviceworkers/unregister/index.html
index b5612d7748a..db23d2cb788 100644
--- a/dom/workers/test/serviceworkers/unregister/index.html
+++ b/dom/workers/test/serviceworkers/unregister/index.html
@@ -19,22 +19,7 @@
     info("unregister/index.html should not to be launched directly!");
   }
 
-  SimpleTest.requestFlakyTimeout("Unfortunately we have no way to test for a page being uncontrolled except waiting for ready to not resolve");
-  var tId = setTimeout(function() {
-    parent.postMessage({ controlled: false }, "*");
-    tId = null;
-  }, 2000);
-
-  navigator.serviceWorker.ready.then(function() {
-    if (tId == null) {
-      parent.postMessage("FAIL!!!", "*");
-      return;
-    }
-
-    clearTimeout(tId);
-    parent.postMessage({ controlled: true }, "*");
-  });
-
+  parent.postMessage({ controlled: !!navigator.serviceWorker.controller }, "*");
 </script>
 </pre>
 </body>
diff --git a/dom/workers/test/serviceworkers/unregister/unregister.html b/dom/workers/test/serviceworkers/unregister/unregister.html
index 64e47b3ae8f..6fda8202681 100644
--- a/dom/workers/test/serviceworkers/unregister/unregister.html
+++ b/dom/workers/test/serviceworkers/unregister/unregister.html
@@ -12,7 +12,7 @@
 <body>
 <script type="text/javascript">
 
-  onmessage = function(e) { parent.postMessage(e.data, "*"); }
+  navigator.serviceWorker.onmessage = function(e) { parent.postMessage(e.data, "*"); }
   navigator.serviceWorker.controller.postMessage("GO");
 
 </script>
diff --git a/dom/workers/test/serviceworkers/workerUpdate/update.html b/dom/workers/test/serviceworkers/workerUpdate/update.html
index 0aa0fb14d02..8f984ccc44e 100644
--- a/dom/workers/test/serviceworkers/workerUpdate/update.html
+++ b/dom/workers/test/serviceworkers/workerUpdate/update.html
@@ -12,7 +12,7 @@
 <body>
 <script type="text/javascript">
 
-  onmessage = function(e) { parent.postMessage(e.data, "*"); }
+  navigator.serviceWorker.onmessage = function(e) { parent.postMessage(e.data, "*"); }
   navigator.serviceWorker.ready.then(function() {
     navigator.serviceWorker.controller.postMessage("GO");
   });