# HG changeset patch
# User Ben Kelly <ben@wanderview.com>
# Date 1517000939 28800
# Node ID c8f0fb23b6e4156eb684e39456b4ab2e2dd830f2
# Parent  018285a507a4f64c823f06e181084733b6bb5399
Bug 1430139 P4 Fix mochitest paths for new dom/serviceworkers location. r=asuth

diff --git a/dom/serviceworkers/test/browser_devtools_serviceworker_interception.js b/dom/serviceworkers/test/browser_devtools_serviceworker_interception.js
--- a/dom/serviceworkers/test/browser_devtools_serviceworker_interception.js
+++ b/dom/serviceworkers/test/browser_devtools_serviceworker_interception.js
@@ -1,17 +1,17 @@
 "use strict";
 
 const BASE_URI =
-  "http://mochi.test:8888/browser/dom/workers/test/serviceworkers/";
+  "http://mochi.test:8888/browser/dom/serviceworkers/test/";
 const emptyDoc = BASE_URI + "empty.html";
 const fakeDoc = BASE_URI + "fake.html";
 const helloDoc = BASE_URI + "hello.html";
 
-const CROSS_URI = "http://example.com/browser/dom/workers/test/serviceworkers/";
+const CROSS_URI = "http://example.com/browser/dom/serviceworkers/test/";
 const crossRedirect = CROSS_URI + "redirect";
 const crossHelloDoc = CROSS_URI + "hello.html";
 
 const sw = BASE_URI + "fetch.js";
 
 // XXXtt: We should be able to move this check to chrome process after we move
 // the interception logic to chrome process.
 async function checkObserverInContent(aInput) {
diff --git a/dom/serviceworkers/test/browser_storage_permission.js b/dom/serviceworkers/test/browser_storage_permission.js
--- a/dom/serviceworkers/test/browser_storage_permission.js
+++ b/dom/serviceworkers/test/browser_storage_permission.js
@@ -1,13 +1,13 @@
 "use strict";
 
 const { interfaces: Ci } = Components;
 
-const BASE_URI = "http://mochi.test:8888/browser/dom/workers/test/serviceworkers/";
+const BASE_URI = "http://mochi.test:8888/browser/dom/serviceworkers/test/";
 const PAGE_URI = BASE_URI + "empty.html";
 const SCOPE = PAGE_URI + "?storage_permission";
 const SW_SCRIPT = BASE_URI + "empty.js";
 
 
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({"set": [
     // Until the e10s refactor is complete, use a single process to avoid
diff --git a/dom/serviceworkers/test/browser_unregister_with_containers.js b/dom/serviceworkers/test/browser_unregister_with_containers.js
--- a/dom/serviceworkers/test/browser_unregister_with_containers.js
+++ b/dom/serviceworkers/test/browser_unregister_with_containers.js
@@ -1,13 +1,13 @@
 "use strict";
 
 const { interfaces: Ci } = Components;
 
-const BASE_URI = "http://mochi.test:8888/browser/dom/workers/test/serviceworkers/";
+const BASE_URI = "http://mochi.test:8888/browser/dom/serviceworkers/test/";
 const PAGE_URI = BASE_URI + "empty.html";
 const SCOPE = PAGE_URI + "?unregister_with_containers";
 const SW_SCRIPT = BASE_URI + "empty.js";
 
 function doRegister(browser) {
   return ContentTask.spawn(browser, { script: SW_SCRIPT, scope: SCOPE },
     async function(opts) {
       let reg = await content.navigator.serviceWorker.register(opts.script,
diff --git a/dom/serviceworkers/test/browser_userContextId_openWindow.js b/dom/serviceworkers/test/browser_userContextId_openWindow.js
--- a/dom/serviceworkers/test/browser_userContextId_openWindow.js
+++ b/dom/serviceworkers/test/browser_userContextId_openWindow.js
@@ -1,14 +1,14 @@
 let { classes: Cc, interfaces: Ci, manager: Cm, results: Cr } = Components;
 
 let swm = Cc["@mozilla.org/serviceworkers/manager;1"].
           getService(Ci.nsIServiceWorkerManager);
 
-const URI = "https://example.com/browser/dom/workers/test/serviceworkers/empty.html";
+const URI = "https://example.com/browser/dom/serviceworkers/test/empty.html";
 const MOCK_CID = Components.ID("{2a0f83c4-8818-4914-a184-f1172b4eaaa7}");
 const ALERTS_SERVICE_CONTRACT_ID = "@mozilla.org/alerts-service;1";
 const USER_CONTEXT_ID = 3
 
 let mockAlertsService = {
   showAlert: function(alert, alertListener) {
     ok(true, "Showing alert");
     setTimeout(function () {
diff --git a/dom/serviceworkers/test/chrome_helpers.js b/dom/serviceworkers/test/chrome_helpers.js
--- a/dom/serviceworkers/test/chrome_helpers.js
+++ b/dom/serviceworkers/test/chrome_helpers.js
@@ -1,12 +1,12 @@
 let swm = Cc["@mozilla.org/serviceworkers/manager;1"].
           getService(Ci.nsIServiceWorkerManager);
 
-let EXAMPLE_URL = "https://example.com/chrome/dom/workers/test/serviceworkers/";
+let EXAMPLE_URL = "https://example.com/chrome/dom/serviceworkers/test/";
 
 function waitForIframeLoad(iframe) {
   return new Promise(function (resolve) {
     iframe.onload = resolve;
   });
 }
 
 function waitForRegister(scope, callback) {
diff --git a/dom/serviceworkers/test/controller/index.html b/dom/serviceworkers/test/controller/index.html
--- a/dom/serviceworkers/test/controller/index.html
+++ b/dom/serviceworkers/test/controller/index.html
@@ -20,17 +20,17 @@
     parent.postMessage({status: "ok", result: result, message: msg}, "*");
   }
 
   function finish() {
     parent.postMessage({status: "done"}, "*");
   }
 
   navigator.serviceWorker.ready.then(function(swr) {
-    my_ok(swr.scope.match(/serviceworkers\/control$/),
+    my_ok(swr.scope.match(/serviceworkers\/test\/control$/),
           "This page should be controlled by upper level registration");
     my_ok(swr.installing == undefined,
           "Upper level registration should not have a installing worker.");
     if (navigator.serviceWorker.controller) {
       // We are controlled.
       // Register a new worker for this sub-scope. After that, controller should still be for upper level, but active should change to be this scope's.
       navigator.serviceWorker.register("../worker2.js", { scope: "./" }).then(function(e) {
         my_ok("installing" in e, "ServiceWorkerRegistration.installing exists.");
@@ -39,17 +39,17 @@
         my_ok("waiting" in e, "ServiceWorkerRegistration.waiting exists.");
         my_ok("active" in e, "ServiceWorkerRegistration.active exists.");
 
         my_ok(e.installing &&
               e.installing.scriptURL.match(/worker2.js$/),
               "Installing is serviceworker/controller");
 
         my_ok("scope" in e, "ServiceWorkerRegistration.scope exists.");
-        my_ok(e.scope.match(/serviceworkers\/controller\/$/), "Scope is serviceworker/controller " + e.scope);
+        my_ok(e.scope.match(/serviceworkers\/test\/controller\/$/), "Scope is serviceworker/test/controller " + e.scope);
 
         my_ok("unregister" in e, "ServiceWorkerRegistration.unregister exists.");
 
         my_ok(navigator.serviceWorker.controller.scriptURL.match(/worker\.js$/),
               "Controller is still worker.js");
 
         e.unregister().then(function(result) {
           my_ok(result, "Unregistering the SW should succeed");
diff --git a/dom/serviceworkers/test/eventsource/eventsource_cors_response.html b/dom/serviceworkers/test/eventsource/eventsource_cors_response.html
--- a/dom/serviceworkers/test/eventsource/eventsource_cors_response.html
+++ b/dom/serviceworkers/test/eventsource/eventsource_cors_response.html
@@ -3,17 +3,17 @@
   http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Bug 1182103 - Test EventSource scenarios with fetch interception</title>
   <script type="text/javascript">
 
-  var prefix = "http://mochi.test:8888/tests/dom/workers/test/serviceworkers/eventsource/";
+  var prefix = "http://mochi.test:8888/tests/dom/serviceworkers/test/eventsource/";
 
   function ok(aCondition, aMessage) {
     parent.postMessage({status: "callback", data: "ok", condition: aCondition, message: aMessage}, "*");
   }
 
   function doUnregister() {
     navigator.serviceWorker.getRegistration().then(swr => {
       swr.unregister().then(function(result) {
diff --git a/dom/serviceworkers/test/eventsource/eventsource_cors_response_intercept_worker.js b/dom/serviceworkers/test/eventsource/eventsource_cors_response_intercept_worker.js
--- a/dom/serviceworkers/test/eventsource/eventsource_cors_response_intercept_worker.js
+++ b/dom/serviceworkers/test/eventsource/eventsource_cors_response_intercept_worker.js
@@ -1,18 +1,18 @@
 // Cross origin request
-var prefix = 'http://example.com/tests/dom/workers/test/serviceworkers/eventsource/';
+var prefix = 'http://example.com/tests/dom/serviceworkers/test/eventsource/';
 
 self.importScripts('eventsource_worker_helper.js');
 
 self.addEventListener('fetch', function (event) {
   var request = event.request;
   var url = new URL(request.url);
 
-  if (url.pathname !== '/tests/dom/workers/test/serviceworkers/eventsource/eventsource.resource') {
+  if (url.pathname !== '/tests/dom/serviceworkers/test/eventsource/eventsource.resource') {
     return;
   }
 
   ok(request.mode === 'cors', 'EventSource should make a CORS request');
   ok(request.cache === 'no-store', 'EventSource should make a no-store request');
   var fetchRequest = new Request(prefix + 'eventsource.resource', { mode: 'cors'});
   event.respondWith(fetch(fetchRequest).then((fetchResponse) => {
     return fetchResponse;
diff --git a/dom/serviceworkers/test/eventsource/eventsource_mixed_content_cors_response.html b/dom/serviceworkers/test/eventsource/eventsource_mixed_content_cors_response.html
--- a/dom/serviceworkers/test/eventsource/eventsource_mixed_content_cors_response.html
+++ b/dom/serviceworkers/test/eventsource/eventsource_mixed_content_cors_response.html
@@ -3,17 +3,17 @@
   http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Bug 1182103 - Test EventSource scenarios with fetch interception</title>
   <script type="text/javascript">
 
-  var prefix = "https://example.com/tests/dom/workers/test/serviceworkers/eventsource/";
+  var prefix = "https://example.com/tests/dom/serviceworkers/test/eventsource/";
 
   function ok(aCondition, aMessage) {
     parent.postMessage({status: "callback", data: "ok", condition: aCondition, message: aMessage}, "*");
   }
 
   function doUnregister() {
     navigator.serviceWorker.getRegistration().then(swr => {
       swr.unregister().then(function(result) {
diff --git a/dom/serviceworkers/test/eventsource/eventsource_mixed_content_cors_response_intercept_worker.js b/dom/serviceworkers/test/eventsource/eventsource_mixed_content_cors_response_intercept_worker.js
--- a/dom/serviceworkers/test/eventsource/eventsource_mixed_content_cors_response_intercept_worker.js
+++ b/dom/serviceworkers/test/eventsource/eventsource_mixed_content_cors_response_intercept_worker.js
@@ -1,17 +1,17 @@
-var prefix = 'http://example.com/tests/dom/workers/test/serviceworkers/eventsource/';
+var prefix = 'http://example.com/tests/dom/serviceworkers/test/eventsource/';
 
 self.importScripts('eventsource_worker_helper.js');
 
 self.addEventListener('fetch', function (event) {
   var request = event.request;
   var url = new URL(request.url);
 
-  if (url.pathname !== '/tests/dom/workers/test/serviceworkers/eventsource/eventsource.resource') {
+  if (url.pathname !== '/tests/dom/serviceworkers/test/eventsource/eventsource.resource') {
     return;
   }
 
   ok(request.mode === 'cors', 'EventSource should make a CORS request');
   ok(request.cache === 'no-store', 'EventSource should make a no-store request');
   var fetchRequest = new Request(prefix + 'eventsource.resource', { mode: 'cors'});
   event.respondWith(fetch(fetchRequest).then((fetchResponse) => {
     return fetchResponse;
diff --git a/dom/serviceworkers/test/eventsource/eventsource_opaque_response.html b/dom/serviceworkers/test/eventsource/eventsource_opaque_response.html
--- a/dom/serviceworkers/test/eventsource/eventsource_opaque_response.html
+++ b/dom/serviceworkers/test/eventsource/eventsource_opaque_response.html
@@ -3,17 +3,17 @@
   http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Bug 1182103 - Test EventSource scenarios with fetch interception</title>
   <script type="text/javascript">
 
-  var prefix = "http://mochi.test:8888/tests/dom/workers/test/serviceworkers/eventsource/";
+  var prefix = "http://mochi.test:8888/tests/dom/serviceworkers/test/eventsource/";
 
   function ok(aCondition, aMessage) {
     parent.postMessage({status: "callback", data: "ok", condition: aCondition, message: aMessage}, "*");
   }
 
   function doUnregister() {
     navigator.serviceWorker.getRegistration().then(swr => {
       swr.unregister().then(function(result) {
diff --git a/dom/serviceworkers/test/eventsource/eventsource_opaque_response_intercept_worker.js b/dom/serviceworkers/test/eventsource/eventsource_opaque_response_intercept_worker.js
--- a/dom/serviceworkers/test/eventsource/eventsource_opaque_response_intercept_worker.js
+++ b/dom/serviceworkers/test/eventsource/eventsource_opaque_response_intercept_worker.js
@@ -1,18 +1,18 @@
 // Cross origin request
-var prefix = 'http://example.com/tests/dom/workers/test/serviceworkers/eventsource/';
+var prefix = 'http://example.com/tests/dom/serviceworkers/test/eventsource/';
 
 self.importScripts('eventsource_worker_helper.js');
 
 self.addEventListener('fetch', function (event) {
   var request = event.request;
   var url = new URL(request.url);
 
-  if (url.pathname !== '/tests/dom/workers/test/serviceworkers/eventsource/eventsource.resource') {
+  if (url.pathname !== '/tests/dom/serviceworkers/test/eventsource/eventsource.resource') {
     return;
   }
 
   ok(request.mode === 'cors', 'EventSource should make a CORS request');
   ok(request.cache === 'no-store', 'EventSource should make a no-store request');
   var fetchRequest = new Request(prefix + 'eventsource.resource', { mode: 'no-cors'});
   event.respondWith(fetch(fetchRequest).then((fetchResponse) => {
     return fetchResponse;
diff --git a/dom/serviceworkers/test/eventsource/eventsource_synthetic_response.html b/dom/serviceworkers/test/eventsource/eventsource_synthetic_response.html
--- a/dom/serviceworkers/test/eventsource/eventsource_synthetic_response.html
+++ b/dom/serviceworkers/test/eventsource/eventsource_synthetic_response.html
@@ -3,17 +3,17 @@
   http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Bug 1182103 - Test EventSource scenarios with fetch interception</title>
   <script type="text/javascript">
 
-  var prefix = "http://mochi.test:8888/tests/dom/workers/test/serviceworkers/eventsource/";
+  var prefix = "http://mochi.test:8888/tests/dom/serviceworkers/test/eventsource/";
 
   function ok(aCondition, aMessage) {
     parent.postMessage({status: "callback", data: "ok", condition: aCondition, message: aMessage}, "*");
   }
 
   function doUnregister() {
     navigator.serviceWorker.getRegistration().then(swr => {
       swr.unregister().then(function(result) {
diff --git a/dom/serviceworkers/test/eventsource/eventsource_synthetic_response_intercept_worker.js b/dom/serviceworkers/test/eventsource/eventsource_synthetic_response_intercept_worker.js
--- a/dom/serviceworkers/test/eventsource/eventsource_synthetic_response_intercept_worker.js
+++ b/dom/serviceworkers/test/eventsource/eventsource_synthetic_response_intercept_worker.js
@@ -1,15 +1,15 @@
 self.importScripts('eventsource_worker_helper.js');
 
 self.addEventListener('fetch', function (event) {
   var request = event.request;
   var url = new URL(request.url);
 
-  if (url.pathname !== '/tests/dom/workers/test/serviceworkers/eventsource/eventsource.resource') {
+  if (url.pathname !== '/tests/dom/serviceworkers/test/eventsource/eventsource.resource') {
     return;
   }
 
   ok(request.mode === 'cors', 'EventSource should make a CORS request');
   var headerList = {
     'Content-Type': 'text/event-stream',
     'Cache-Control': 'no-cache, must-revalidate'
   };
diff --git a/dom/serviceworkers/test/fetch/context/csp-violate.sjs b/dom/serviceworkers/test/fetch/context/csp-violate.sjs
--- a/dom/serviceworkers/test/fetch/context/csp-violate.sjs
+++ b/dom/serviceworkers/test/fetch/context/csp-violate.sjs
@@ -1,6 +1,6 @@
 function handleRequest(request, response)
 {
-  response.setHeader("Content-Security-Policy", "default-src 'none'; report-uri /tests/dom/workers/test/serviceworkers/fetch/context/csp-report.sjs", false);
+  response.setHeader("Content-Security-Policy", "default-src 'none'; report-uri /tests/dom/serviceworkers/test/fetch/context/csp-report.sjs", false);
   response.setHeader("Content-Type", "text/html", false);
   response.write("<link rel=stylesheet href=style.css>");
 }
diff --git a/dom/serviceworkers/test/fetch/hsts/embedder.html b/dom/serviceworkers/test/fetch/hsts/embedder.html
--- a/dom/serviceworkers/test/fetch/hsts/embedder.html
+++ b/dom/serviceworkers/test/fetch/hsts/embedder.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script>
   window.onmessage = function(e) {
     window.parent.postMessage(e.data, "*");
   };
 </script>
-<iframe src="http://example.com/tests/dom/workers/test/serviceworkers/fetch/hsts/index.html"></iframe>
+<iframe src="http://example.com/tests/dom/serviceworkers/test/fetch/hsts/index.html"></iframe>
diff --git a/dom/serviceworkers/test/fetch/hsts/image.html b/dom/serviceworkers/test/fetch/hsts/image.html
--- a/dom/serviceworkers/test/fetch/hsts/image.html
+++ b/dom/serviceworkers/test/fetch/hsts/image.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <script>
 onload=function(){
   var img = new Image();
-  img.src = "http://example.com/tests/dom/workers/test/serviceworkers/fetch/hsts/image-20px.png";
+  img.src = "http://example.com/tests/dom/serviceworkers/test/fetch/hsts/image-20px.png";
   img.onload = function() {
     window.parent.postMessage({status: "image", data: img.width}, "*");
   };
   img.onerror = function() {
     window.parent.postMessage({status: "image", data: "error"}, "*");
   };
 };
 </script>
diff --git a/dom/serviceworkers/test/fetch/origin/https/index-https.sjs b/dom/serviceworkers/test/fetch/origin/https/index-https.sjs
--- a/dom/serviceworkers/test/fetch/origin/https/index-https.sjs
+++ b/dom/serviceworkers/test/fetch/origin/https/index-https.sjs
@@ -1,4 +1,4 @@
 function handleRequest(request, response) {
   response.setStatusLine(null, 308, "Permanent Redirect");
-  response.setHeader("Location", "https://example.org/tests/dom/workers/test/serviceworkers/fetch/origin/https/realindex.html", false);
+  response.setHeader("Location", "https://example.org/tests/dom/serviceworkers/test/fetch/origin/https/realindex.html", false);
 }
diff --git a/dom/serviceworkers/test/fetch/origin/https/origin_test.js b/dom/serviceworkers/test/fetch/origin/https/origin_test.js
--- a/dom/serviceworkers/test/fetch/origin/https/origin_test.js
+++ b/dom/serviceworkers/test/fetch/origin/https/origin_test.js
@@ -1,9 +1,9 @@
-var prefix = "/tests/dom/workers/test/serviceworkers/fetch/origin/https/";
+var prefix = "/tests/dom/serviceworkers/test/fetch/origin/https/";
 
 function addOpaqueRedirect(cache, file) {
   return fetch(new Request(prefix + file, { redirect: "manual" })).then(function(response) {
     return cache.put(prefix + file, response);
   });
 }
 
 self.addEventListener("install", function(event) {
diff --git a/dom/serviceworkers/test/fetch/origin/index-to-https.sjs b/dom/serviceworkers/test/fetch/origin/index-to-https.sjs
--- a/dom/serviceworkers/test/fetch/origin/index-to-https.sjs
+++ b/dom/serviceworkers/test/fetch/origin/index-to-https.sjs
@@ -1,4 +1,4 @@
 function handleRequest(request, response) {
   response.setStatusLine(null, 308, "Permanent Redirect");
-  response.setHeader("Location", "https://example.org/tests/dom/workers/test/serviceworkers/fetch/origin/realindex.html", false);
+  response.setHeader("Location", "https://example.org/tests/dom/serviceworkers/test/fetch/origin/realindex.html", false);
 }
diff --git a/dom/serviceworkers/test/fetch/origin/index.sjs b/dom/serviceworkers/test/fetch/origin/index.sjs
--- a/dom/serviceworkers/test/fetch/origin/index.sjs
+++ b/dom/serviceworkers/test/fetch/origin/index.sjs
@@ -1,4 +1,4 @@
 function handleRequest(request, response) {
   response.setStatusLine(null, 308, "Permanent Redirect");
-  response.setHeader("Location", "http://example.org/tests/dom/workers/test/serviceworkers/fetch/origin/realindex.html", false);
+  response.setHeader("Location", "http://example.org/tests/dom/serviceworkers/test/fetch/origin/realindex.html", false);
 }
diff --git a/dom/serviceworkers/test/fetch/origin/origin_test.js b/dom/serviceworkers/test/fetch/origin/origin_test.js
--- a/dom/serviceworkers/test/fetch/origin/origin_test.js
+++ b/dom/serviceworkers/test/fetch/origin/origin_test.js
@@ -1,9 +1,9 @@
-var prefix = "/tests/dom/workers/test/serviceworkers/fetch/origin/";
+var prefix = "/tests/dom/serviceworkers/test/fetch/origin/";
 
 function addOpaqueRedirect(cache, file) {
   return fetch(new Request(prefix + file, { redirect: "manual" })).then(function(response) {
     return cache.put(prefix + file, response);
   });
 }
 
 self.addEventListener("install", function(event) {
diff --git a/dom/serviceworkers/test/fetch/requesturl/redirect.sjs b/dom/serviceworkers/test/fetch/requesturl/redirect.sjs
--- a/dom/serviceworkers/test/fetch/requesturl/redirect.sjs
+++ b/dom/serviceworkers/test/fetch/requesturl/redirect.sjs
@@ -1,4 +1,4 @@
 function handleRequest(request, response) {
   response.setStatusLine(null, 308, "Permanent Redirect");
-  response.setHeader("Location", "http://example.org/tests/dom/workers/test/serviceworkers/fetch/requesturl/secret.html", false);
+  response.setHeader("Location", "http://example.org/tests/dom/serviceworkers/test/fetch/requesturl/secret.html", false);
 }
diff --git a/dom/serviceworkers/test/fetch/requesturl/redirector.html b/dom/serviceworkers/test/fetch/requesturl/redirector.html
--- a/dom/serviceworkers/test/fetch/requesturl/redirector.html
+++ b/dom/serviceworkers/test/fetch/requesturl/redirector.html
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<meta http-equiv="refresh" content="3;URL=/tests/dom/workers/test/serviceworkers/fetch/requesturl/redirect.sjs">
+<meta http-equiv="refresh" content="3;URL=/tests/dom/serviceworkers/test/fetch/requesturl/redirect.sjs">
diff --git a/dom/serviceworkers/test/fetch/upgrade-insecure/embedder.html b/dom/serviceworkers/test/fetch/upgrade-insecure/embedder.html
--- a/dom/serviceworkers/test/fetch/upgrade-insecure/embedder.html
+++ b/dom/serviceworkers/test/fetch/upgrade-insecure/embedder.html
@@ -2,9 +2,9 @@
 <script>
   window.onmessage = function(e) {
     window.parent.postMessage(e.data, "*");
     if (e.data.status == "protocol") {
       document.querySelector("iframe").src = "image.html";
     }
   };
 </script>
-<iframe src="http://example.com/tests/dom/workers/test/serviceworkers/fetch/upgrade-insecure/index.html"></iframe>
+<iframe src="http://example.com/tests/dom/serviceworkers/test/fetch/upgrade-insecure/index.html"></iframe>
diff --git a/dom/serviceworkers/test/fetch/upgrade-insecure/image.html b/dom/serviceworkers/test/fetch/upgrade-insecure/image.html
--- a/dom/serviceworkers/test/fetch/upgrade-insecure/image.html
+++ b/dom/serviceworkers/test/fetch/upgrade-insecure/image.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <script>
 onload=function(){
   var img = new Image();
-  img.src = "http://example.com/tests/dom/workers/test/serviceworkers/fetch/upgrade-insecure/image-20px.png";
+  img.src = "http://example.com/tests/dom/serviceworkers/test/fetch/upgrade-insecure/image-20px.png";
   img.onload = function() {
     window.parent.postMessage({status: "image", data: img.width}, "*");
   };
   img.onerror = function() {
     window.parent.postMessage({status: "image", data: "error"}, "*");
   };
 };
 </script>
diff --git a/dom/serviceworkers/test/fetch_event_worker.js b/dom/serviceworkers/test/fetch_event_worker.js
--- a/dom/serviceworkers/test/fetch_event_worker.js
+++ b/dom/serviceworkers/test/fetch_event_worker.js
@@ -318,17 +318,17 @@ onfetch = function(ev) {
   }
 
   else if (ev.request.url.includes('somethingelse.txt')) {
     ev.respondWith(new Response('something else response body', {}));
   }
 
   else if (ev.request.url.includes('redirect_serviceworker.sjs')) {
     // The redirect_serviceworker.sjs server-side JavaScript file redirects to
-    // 'http://mochi.test:8888/tests/dom/workers/test/serviceworkers/worker.js'
+    // 'http://mochi.test:8888/tests/dom/serviceworkers/test/worker.js'
     // The redirected fetch should not go through the SW since the original
     // fetch was initiated from a SW.
     ev.respondWith(fetch('redirect_serviceworker.sjs'));
   }
 
   else if (ev.request.url.includes('load_cross_origin_xml_document_synthetic.xml')) {
     if (ev.request.mode != 'same-origin') {
       ev.respondWith(Promise.reject());
diff --git a/dom/serviceworkers/test/isolated/multi-e10s-update/browser_multie10s_update.js b/dom/serviceworkers/test/isolated/multi-e10s-update/browser_multie10s_update.js
--- a/dom/serviceworkers/test/isolated/multi-e10s-update/browser_multie10s_update.js
+++ b/dom/serviceworkers/test/isolated/multi-e10s-update/browser_multie10s_update.js
@@ -1,15 +1,15 @@
 "use strict";
 
 // Testing if 2 child processes are correctly managed when they both try to do
 // an SW update.
 
 const BASE_URI =
- "http://mochi.test:8888/browser/dom/workers/test/serviceworkers/isolated/multi-e10s-update/";
+ "http://mochi.test:8888/browser/dom/serviceworkers/test/isolated/multi-e10s-update/";
 
 add_task(async function test_update() {
   info("Setting the prefs to having multi-e10s enabled");
   await SpecialPowers.pushPrefEnv({"set": [
     ["dom.ipc.processCount", 4],
     ["dom.serviceWorkers.enabled", true],
     ["dom.serviceWorkers.testing.enabled", true],
   ]});
diff --git a/dom/serviceworkers/test/opaque_intercept_worker.js b/dom/serviceworkers/test/opaque_intercept_worker.js
--- a/dom/serviceworkers/test/opaque_intercept_worker.js
+++ b/dom/serviceworkers/test/opaque_intercept_worker.js
@@ -1,12 +1,12 @@
 var name = 'opaqueInterceptCache';
 
 // Cross origin request to ensure that an opaque response is used
-var prefix = 'http://example.com/tests/dom/workers/test/serviceworkers/'
+var prefix = 'http://example.com/tests/dom/serviceworkers/test/'
 
 self.addEventListener('install', function(event) {
   var request = new Request(prefix + 'notify_loaded.js', { mode: 'no-cors' });
   event.waitUntil(
     Promise.all([caches.open(name), fetch(request)]).then(function(results) {
       var cache = results[0];
       var response = results[1];
       return cache.put('./sw_clients/does_not_exist.js', response);
diff --git a/dom/serviceworkers/test/openWindow_worker.js b/dom/serviceworkers/test/openWindow_worker.js
--- a/dom/serviceworkers/test/openWindow_worker.js
+++ b/dom/serviceworkers/test/openWindow_worker.js
@@ -83,20 +83,20 @@ onmessage = function(event) {
     }));
   }
 }
 
 onnotificationclick = function(e) {
   var results = [];
   var promises = [];
 
-  var redirect = "http://mochi.test:8888/tests/dom/workers/test/serviceworkers/redirect.sjs?"
-  var redirect_xorigin = "http://example.com/tests/dom/workers/test/serviceworkers/redirect.sjs?"
-  var same_origin = "http://mochi.test:8888/tests/dom/workers/test/serviceworkers/open_window/client.html"
-  var different_origin = "http://example.com/tests/dom/workers/test/serviceworkers/open_window/client.html"
+  var redirect = "http://mochi.test:8888/tests/dom/serviceworkers/test/redirect.sjs?"
+  var redirect_xorigin = "http://example.com/tests/dom/serviceworkers/test/redirect.sjs?"
+  var same_origin = "http://mochi.test:8888/tests/dom/serviceworkers/test/open_window/client.html"
+  var different_origin = "http://example.com/tests/dom/serviceworkers/test/open_window/client.html"
 
 
   promises.push(testForUrl("about:blank", "TypeError", null, results));
   promises.push(testForUrl(different_origin, null, null, results));
   promises.push(testForUrl(same_origin, null, {url: same_origin}, results));
   promises.push(testForUrl("open_window/client.html", null, {url: same_origin}, results));
 
   // redirect tests
diff --git a/dom/serviceworkers/test/open_window/client.html b/dom/serviceworkers/test/open_window/client.html
--- a/dom/serviceworkers/test/open_window/client.html
+++ b/dom/serviceworkers/test/open_window/client.html
@@ -9,17 +9,17 @@
 </head>
 <body>
 <p id="display"></p>
 <div id="content" style="display: none"></div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   window.onload = function() {
-    if (window.location == "http://mochi.test:8888/tests/dom/workers/test/serviceworkers/open_window/client.html") {
+    if (window.location == "http://mochi.test:8888/tests/dom/serviceworkers/test/open_window/client.html") {
       navigator.serviceWorker.ready.then(function(result) {
         navigator.serviceWorker.onmessage = function(event) {
           if (event.data !== "CLOSE") {
             dump("ERROR: unexepected reply from the service worker.\n");
           }
           if (parent) {
             parent.postMessage("CLOSE", "*");
           }
@@ -31,17 +31,17 @@
       window.onmessage = function(event) {
         if (event.data !== "CLOSE") {
             dump("ERROR: unexepected reply from the iframe.\n");
         }
         window.close();
       }
 
       var iframe = document.createElement('iframe');
-      iframe.src = "http://mochi.test:8888/tests/dom/workers/test/serviceworkers/open_window/client.html";
+      iframe.src = "http://mochi.test:8888/tests/dom/serviceworkers/test/open_window/client.html";
       document.body.appendChild(iframe);
     }
   }
 
 </script>
 </pre>
 </body>
 </html>
diff --git a/dom/serviceworkers/test/redirect_post.sjs b/dom/serviceworkers/test/redirect_post.sjs
--- a/dom/serviceworkers/test/redirect_post.sjs
+++ b/dom/serviceworkers/test/redirect_post.sjs
@@ -18,17 +18,17 @@ function handleRequest(request, response
 
   var body = decodeURIComponent(
     escape(String.fromCharCode.apply(null, bodyBytes)));
 
   var currentHop = query.hop ? parseInt(query.hop) : 0;
 
   var obj = JSON.parse(body);
   if (currentHop < obj.hops) {
-    var newURL = '/tests/dom/workers/test/serviceworkers/redirect_post.sjs?hop=' +
+    var newURL = '/tests/dom/serviceworkers/test/redirect_post.sjs?hop=' +
                  (1 + currentHop);
     response.setStatusLine(null, 307, 'redirect');
     response.setHeader('Location', newURL);
     return;
   }
 
   response.setHeader('Content-Type', 'application/json');
   response.write(body);
diff --git a/dom/serviceworkers/test/redirect_serviceworker.sjs b/dom/serviceworkers/test/redirect_serviceworker.sjs
--- a/dom/serviceworkers/test/redirect_serviceworker.sjs
+++ b/dom/serviceworkers/test/redirect_serviceworker.sjs
@@ -1,4 +1,4 @@
 function handleRequest(request, response) {
   response.setStatusLine("1.1", 302, "Found");
-  response.setHeader("Location", "http://mochi.test:8888/tests/dom/workers/test/serviceworkers/worker.js");
+  response.setHeader("Location", "http://mochi.test:8888/tests/dom/serviceworkers/test/worker.js");
 }
diff --git a/dom/serviceworkers/test/simpleregister/index.html b/dom/serviceworkers/test/simpleregister/index.html
--- a/dom/serviceworkers/test/simpleregister/index.html
+++ b/dom/serviceworkers/test/simpleregister/index.html
@@ -22,17 +22,17 @@
               if (a[i].scope.match(/simpleregister\//)) {
                 a[i].onupdatefound = function(e) {
                   eventReceived();
                 }
               }
             }
           });
 
-          navigator.serviceWorker.getRegistration('http://mochi.test:8888/tests/dom/workers/test/serviceworkers/simpleregister/')
+          navigator.serviceWorker.getRegistration('http://mochi.test:8888/tests/dom/serviceworkers/test/simpleregister/')
             .then(function(a) {
             window.parent.postMessage({ type: "check", status: a instanceof ServiceWorkerRegistration,
                                         msg: "getRegistration returns a ServiceWorkerRegistration" }, "*");
             a.onupdatefound = function(e) {
               eventReceived();
             }
           });
 
diff --git a/dom/serviceworkers/test/sw_clients/file_blob_upload_frame.html b/dom/serviceworkers/test/sw_clients/file_blob_upload_frame.html
--- a/dom/serviceworkers/test/sw_clients/file_blob_upload_frame.html
+++ b/dom/serviceworkers/test/sw_clients/file_blob_upload_frame.html
@@ -49,17 +49,17 @@ function makeFileBlob(obj) {
     };
   });
 }
 
 navigator.serviceWorker.ready.then(function() {
   parent.postMessage({ status: 'READY' }, '*');
 });
 
-var URL = '/tests/dom/workers/test/serviceworkers/redirect_post.sjs';
+var URL = '/tests/dom/serviceworkers/test/redirect_post.sjs';
 
 addEventListener('message', function(evt) {
   if (evt.data.type = 'TEST') {
     makeFileBlob(evt.data.body).then(function(blob) {
       return fetch(URL, { method: 'POST', body: blob });
     }).then(function(response) {
       return response.json();
     }).then(function(result) {
diff --git a/dom/serviceworkers/test/swa/worker_scope_precise.js^headers^ b/dom/serviceworkers/test/swa/worker_scope_precise.js^headers^
--- a/dom/serviceworkers/test/swa/worker_scope_precise.js^headers^
+++ b/dom/serviceworkers/test/swa/worker_scope_precise.js^headers^
@@ -1,1 +1,1 @@
-Service-Worker-Allowed: /tests/dom/workers/test/serviceworkers/swa
+Service-Worker-Allowed: /tests/dom/serviceworkers/test/swa
diff --git a/dom/serviceworkers/test/swa/worker_scope_too_deep.js^headers^ b/dom/serviceworkers/test/swa/worker_scope_too_deep.js^headers^
--- a/dom/serviceworkers/test/swa/worker_scope_too_deep.js^headers^
+++ b/dom/serviceworkers/test/swa/worker_scope_too_deep.js^headers^
@@ -1,1 +1,1 @@
-Service-Worker-Allowed: /tests/dom/workers/test/serviceworkers/swa/deep/way/too/specific
+Service-Worker-Allowed: /tests/dom/serviceworkers/test/swa/deep/way/too/specific
diff --git a/dom/serviceworkers/test/swa/worker_scope_too_narrow.js^headers^ b/dom/serviceworkers/test/swa/worker_scope_too_narrow.js^headers^
--- a/dom/serviceworkers/test/swa/worker_scope_too_narrow.js^headers^
+++ b/dom/serviceworkers/test/swa/worker_scope_too_narrow.js^headers^
@@ -1,1 +1,1 @@
-Service-Worker-Allowed: /tests/dom/workers
+Service-Worker-Allowed: /tests/dom/serviceworkers
diff --git a/dom/serviceworkers/test/test_cookie_fetch.html b/dom/serviceworkers/test/test_cookie_fetch.html
--- a/dom/serviceworkers/test/test_cookie_fetch.html
+++ b/dom/serviceworkers/test/test_cookie_fetch.html
@@ -15,32 +15,35 @@
 <iframe></iframe>
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/cookie/register.html";
+    iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/cookie/register.html";
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
         // Remove the iframe and recreate a new one to ensure that any traces
         // of the cookies have been removed from the child process.
         iframe.remove();
         iframe = document.createElement("iframe");
         document.getElementById("content").appendChild(iframe);
 
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/cookie/synth.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/cookie/synth.html";
       } else if (e.data.status == "done") {
-        is(e.data.cookie, "foo=bar", "The synthesized document has access to its cookies");
+        // Note, we can't do an exact is() comparison here since other
+        // tests can leave cookies on the domain.
+        ok(e.data.cookie.includes("foo=bar"),
+           "The synthesized document has access to its cookies");
 
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/cookie/unregister.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/cookie/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
         window.onmessage = null;
         ok(true, "Test finished successfully");
         SimpleTest.finish();
       }
     };
   }
 
diff --git a/dom/serviceworkers/test/test_cross_origin_url_after_redirect.html b/dom/serviceworkers/test/test_cross_origin_url_after_redirect.html
--- a/dom/serviceworkers/test/test_cross_origin_url_after_redirect.html
+++ b/dom/serviceworkers/test/test_cross_origin_url_after_redirect.html
@@ -15,24 +15,24 @@
 <iframe></iframe>
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/requesturl/register.html";
+    iframe.src = "/tests/dom/serviceworkers/test/fetch/requesturl/register.html";
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
-        iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/requesturl/index.html";
+        iframe.src = "/tests/dom/serviceworkers/test/fetch/requesturl/index.html";
       } else if (e.data.status == "done") {
-        iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/requesturl/unregister.html";
+        iframe.src = "/tests/dom/serviceworkers/test/fetch/requesturl/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
         window.onmessage = null;
         ok(true, "Test finished successfully");
         SimpleTest.finish();
       }
     };
   }
 
diff --git a/dom/serviceworkers/test/test_csp_upgrade-insecure_intercept.html b/dom/serviceworkers/test/test_csp_upgrade-insecure_intercept.html
--- a/dom/serviceworkers/test/test_csp_upgrade-insecure_intercept.html
+++ b/dom/serviceworkers/test/test_csp_upgrade-insecure_intercept.html
@@ -15,27 +15,27 @@
 <iframe></iframe>
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/upgrade-insecure/register.html";
+    iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/upgrade-insecure/register.html";
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/upgrade-insecure/embedder.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/upgrade-insecure/embedder.html";
       } else if (e.data.status == "protocol") {
         is(e.data.data, "https:", "Correct protocol expected");
       } else if (e.data.status == "image") {
         is(e.data.data, 40, "The image request was upgraded before interception");
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/upgrade-insecure/unregister.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/upgrade-insecure/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
         window.onmessage = null;
         SimpleTest.finish();
       }
     };
   }
 
   SimpleTest.waitForExplicitFinish();
diff --git a/dom/serviceworkers/test/test_devtools_track_serviceworker_time.html b/dom/serviceworkers/test/test_devtools_track_serviceworker_time.html
--- a/dom/serviceworkers/test/test_devtools_track_serviceworker_time.html
+++ b/dom/serviceworkers/test/test_devtools_track_serviceworker_time.html
@@ -15,17 +15,17 @@ const State = {
   INSTALLED: Ci.nsIServiceWorkerInfo.STATE_INSTALLED,
   ACTIVATING: Ci.nsIServiceWorkerInfo.STATE_ACTIVATING,
   ACTIVATED: Ci.nsIServiceWorkerInfo.STATE_ACTIVATED,
   REDUNDANT: Ci.nsIServiceWorkerInfo.STATE_REDUNDANT
 };
 let swm = Cc["@mozilla.org/serviceworkers/manager;1"].
           getService(Ci.nsIServiceWorkerManager);
 
-let EXAMPLE_URL = "https://example.com/chrome/dom/workers/test/serviceworkers/";
+let EXAMPLE_URL = "https://example.com/chrome/dom/serviceworkers/test/";
 
 let swrlistener = null;
 let registrationInfo = null;
 
 // Use it to keep the sw after unregistration.
 let astrayServiceWorkerInfo = null;
 
 let expectedResults = [
diff --git a/dom/serviceworkers/test/test_eventsource_intercept.html b/dom/serviceworkers/test/test_eventsource_intercept.html
--- a/dom/serviceworkers/test/test_eventsource_intercept.html
+++ b/dom/serviceworkers/test/test_eventsource_intercept.html
@@ -70,22 +70,22 @@
         return testFrame("eventsource/eventsource_register_worker.html" +
                          "?script=eventsource_synthetic_response_intercept_worker.js");
       })
       .then(() => {
         return testFrame("eventsource/eventsource_synthetic_response.html");
       })
       .then(() => {
         info("Going to intercept and test mixed content cors responses");
-        return testFrame("https://example.com/tests/dom/workers/test/serviceworkers/" +
+        return testFrame("https://example.com/tests/dom/serviceworkers/test/" +
                          "eventsource/eventsource_register_worker.html" +
                          "?script=eventsource_mixed_content_cors_response_intercept_worker.js");
       })
       .then(() => {
-        return testFrame("https://example.com/tests/dom/workers/test/serviceworkers/" +
+        return testFrame("https://example.com/tests/dom/serviceworkers/test/" +
                          "eventsource/eventsource_mixed_content_cors_response.html");
       })
       .then(SimpleTest.finish)
       .catch(function(e) {
         ok(false, "Some test failed with error " + e);
         SimpleTest.finish();
       });
   }
diff --git a/dom/serviceworkers/test/test_hsts_upgrade_intercept.html b/dom/serviceworkers/test/test_hsts_upgrade_intercept.html
--- a/dom/serviceworkers/test/test_hsts_upgrade_intercept.html
+++ b/dom/serviceworkers/test/test_hsts_upgrade_intercept.html
@@ -16,36 +16,36 @@
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   var framesLoaded = 0;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/hsts/register.html";
+    iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/hsts/register.html";
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
-        iframe.src = "http://example.com/tests/dom/workers/test/serviceworkers/fetch/hsts/index.html";
+        iframe.src = "http://example.com/tests/dom/serviceworkers/test/fetch/hsts/index.html";
       } else if (e.data.status == "protocol") {
         is(e.data.data, "https:", "Correct protocol expected");
         ok(e.data.securityInfoPresent, "Security info present on intercepted value");
         switch (++framesLoaded) {
         case 1:
-          iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/hsts/embedder.html";
+          iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/hsts/embedder.html";
           break;
         case 2:
-          iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/hsts/image.html";
+          iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/hsts/image.html";
           break;
         }
       } else if (e.data.status == "image") {
         is(e.data.data, 40, "The image request was upgraded before interception");
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/hsts/unregister.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/hsts/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
         window.onmessage = null;
         SpecialPowers.cleanUpSTSData("http://example.com");
         SimpleTest.finish();
       }
     };
   }
 
diff --git a/dom/serviceworkers/test/test_https_fetch.html b/dom/serviceworkers/test/test_https_fetch.html
--- a/dom/serviceworkers/test/test_https_fetch.html
+++ b/dom/serviceworkers/test/test_https_fetch.html
@@ -15,35 +15,35 @@
 <iframe></iframe>
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/https/register.html";
+    iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/https/register.html";
     var ios;
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
         ios = SpecialPowers.Cc["@mozilla.org/network/io-service;1"]
                            .getService(SpecialPowers.Ci.nsIIOService);
         ios.offline = true;
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/https/index.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/https/index.html";
       } else if (e.data.status == "done") {
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/https/synth-sw.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/https/synth-sw.html";
       } else if (e.data.status == "done-synth-sw") {
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/https/synth-window.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/https/synth-window.html";
       } else if (e.data.status == "done-synth-window") {
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/https/synth.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/https/synth.html";
       } else if (e.data.status == "done-synth") {
         ios.offline = false;
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/https/unregister.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/https/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
         window.onmessage = null;
         ok(true, "Test finished successfully");
         SimpleTest.finish();
       }
     };
   }
 
diff --git a/dom/serviceworkers/test/test_https_fetch_cloned_response.html b/dom/serviceworkers/test/test_https_fetch_cloned_response.html
--- a/dom/serviceworkers/test/test_https_fetch_cloned_response.html
+++ b/dom/serviceworkers/test/test_https_fetch_cloned_response.html
@@ -15,29 +15,29 @@
 <iframe></iframe>
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/https/clonedresponse/register.html";
+    iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/https/clonedresponse/register.html";
     var ios;
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
         ios = SpecialPowers.Cc["@mozilla.org/network/io-service;1"]
                            .getService(SpecialPowers.Ci.nsIIOService);
         ios.offline = true;
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/https/clonedresponse/index.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/https/clonedresponse/index.html";
       } else if (e.data.status == "done") {
         ios.offline = false;
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/https/clonedresponse/unregister.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/https/clonedresponse/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
         window.onmessage = null;
         ok(true, "Test finished successfully");
         SimpleTest.finish();
       }
     };
   }
 
diff --git a/dom/serviceworkers/test/test_https_origin_after_redirect.html b/dom/serviceworkers/test/test_https_origin_after_redirect.html
--- a/dom/serviceworkers/test/test_https_origin_after_redirect.html
+++ b/dom/serviceworkers/test/test_https_origin_after_redirect.html
@@ -15,30 +15,30 @@
 <iframe></iframe>
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/origin/https/register.html";
+    iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/origin/https/register.html";
     var win;
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
-        win = window.open("https://example.com/tests/dom/workers/test/serviceworkers/fetch/origin/https/index-https.sjs", "mywindow", "width=100,height=100");
+        win = window.open("https://example.com/tests/dom/serviceworkers/test/fetch/origin/https/index-https.sjs", "mywindow", "width=100,height=100");
       } else if (e.data.status == "domain") {
         is(e.data.data, "example.org", "Correct domain expected");
       } else if (e.data.status == "origin") {
         is(e.data.data, "https://example.org", "Correct origin expected");
       } else if (e.data.status == "done") {
         win.close();
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/origin/https/unregister.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/origin/https/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
         window.onmessage = null;
         ok(true, "Test finished successfully");
         SimpleTest.finish();
       }
     };
   }
 
diff --git a/dom/serviceworkers/test/test_https_origin_after_redirect_cached.html b/dom/serviceworkers/test/test_https_origin_after_redirect_cached.html
--- a/dom/serviceworkers/test/test_https_origin_after_redirect_cached.html
+++ b/dom/serviceworkers/test/test_https_origin_after_redirect_cached.html
@@ -15,30 +15,30 @@
 <iframe></iframe>
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/origin/https/register.html";
+    iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/origin/https/register.html";
     var win;
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
-        win = window.open("https://example.com/tests/dom/workers/test/serviceworkers/fetch/origin/https/index-cached-https.sjs", "mywindow", "width=100,height=100");
+        win = window.open("https://example.com/tests/dom/serviceworkers/test/fetch/origin/https/index-cached-https.sjs", "mywindow", "width=100,height=100");
       } else if (e.data.status == "domain") {
         is(e.data.data, "example.org", "Correct domain expected");
       } else if (e.data.status == "origin") {
         is(e.data.data, "https://example.org", "Correct origin expected");
       } else if (e.data.status == "done") {
         win.close();
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/origin/https/unregister.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/origin/https/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
         window.onmessage = null;
         ok(true, "Test finished successfully");
         SimpleTest.finish();
       }
     };
   }
 
diff --git a/dom/serviceworkers/test/test_https_synth_fetch_from_cached_sw.html b/dom/serviceworkers/test/test_https_synth_fetch_from_cached_sw.html
--- a/dom/serviceworkers/test/test_https_synth_fetch_from_cached_sw.html
+++ b/dom/serviceworkers/test/test_https_synth_fetch_from_cached_sw.html
@@ -15,17 +15,17 @@
 <iframe></iframe>
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/https/register.html";
+    iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/https/register.html";
     var ios;
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
         ios = SpecialPowers.Cc["@mozilla.org/network/io-service;1"]
                            .getService(SpecialPowers.Ci.nsIIOService);
         ios.offline = true;
@@ -35,22 +35,22 @@
         // and do a GC to ensure that the SW is destroyed.  This way, when we
         // load synth.html for the second time, we will first recreate the
         // service worker from the cache.  This is intended to test that we
         // properly store and retrieve the security info from the cache.
         iframe.remove();
         iframe = null;
         SpecialPowers.exactGC(function() {
           iframe = document.createElement("iframe");
-          iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/https/synth.html";
+          iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/https/synth.html";
           document.body.appendChild(iframe);
         });
       } else if (e.data.status == "done-synth") {
         ios.offline = false;
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/https/unregister.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/https/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
         window.onmessage = null;
         ok(true, "Test finished successfully");
         SimpleTest.finish();
       }
     };
   }
 
diff --git a/dom/serviceworkers/test/test_imagecache.html b/dom/serviceworkers/test/test_imagecache.html
--- a/dom/serviceworkers/test/test_imagecache.html
+++ b/dom/serviceworkers/test/test_imagecache.html
@@ -15,28 +15,28 @@
 <iframe></iframe>
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/imagecache/register.html";
+    iframe.src = "/tests/dom/serviceworkers/test/fetch/imagecache/register.html";
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
-        iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/imagecache/index.html";
+        iframe.src = "/tests/dom/serviceworkers/test/fetch/imagecache/index.html";
       } else if (e.data.status == "result") {
         is(e.data.url, "image-40px.png", "Correct url expected");
         is(e.data.width, 40, "Correct width expected");
-        iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/imagecache/unregister.html";
+        iframe.src = "/tests/dom/serviceworkers/test/fetch/imagecache/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
-        iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/imagecache/postmortem.html";
+        iframe.src = "/tests/dom/serviceworkers/test/fetch/imagecache/postmortem.html";
       } else if (e.data.status == "postmortem") {
         is(e.data.width, 20, "Correct width expected");
         window.onmessage = null;
         ok(true, "Test finished successfully");
         SimpleTest.finish();
       }
     };
   }
diff --git a/dom/serviceworkers/test/test_imagecache_max_age.html b/dom/serviceworkers/test/test_imagecache_max_age.html
--- a/dom/serviceworkers/test/test_imagecache_max_age.html
+++ b/dom/serviceworkers/test/test_imagecache_max_age.html
@@ -16,40 +16,40 @@
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   var framesLoaded = 0;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/imagecache-maxage/register.html";
+    iframe.src = "/tests/dom/serviceworkers/test/fetch/imagecache-maxage/register.html";
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
-        iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/imagecache-maxage/index.html";
+        iframe.src = "/tests/dom/serviceworkers/test/fetch/imagecache-maxage/index.html";
       } else if (e.data.status == "result") {
         switch (++framesLoaded) {
         case 1:
           is(e.data.url, "image-20px.png", "Correct url expected");
           is(e.data.url2, "image-20px.png", "Correct url expected");
           is(e.data.width, 20, "Correct width expected");
           is(e.data.width2, 20, "Correct width expected");
           // Wait for 100ms so that the image gets expired.
           setTimeout(function() {
-            iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/imagecache-maxage/index.html?new"
+            iframe.src = "/tests/dom/serviceworkers/test/fetch/imagecache-maxage/index.html?new"
           }, 100);
           break;
         case 2:
           is(e.data.url, "image-40px.png", "Correct url expected");
           is(e.data.url2, "image-40px.png", "Correct url expected");
           is(e.data.width, 40, "Correct width expected");
           is(e.data.width2, 40, "Correct width expected");
-          iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/imagecache-maxage/unregister.html";
+          iframe.src = "/tests/dom/serviceworkers/test/fetch/imagecache-maxage/unregister.html";
           break;
         default:
           ok(false, "This should never happen");
         }
       } else if (e.data.status == "unregistrationdone") {
         window.onmessage = null;
         SimpleTest.finish();
       }
diff --git a/dom/serviceworkers/test/test_importscript_mixedcontent.html b/dom/serviceworkers/test/test_importscript_mixedcontent.html
--- a/dom/serviceworkers/test/test_importscript_mixedcontent.html
+++ b/dom/serviceworkers/test/test_importscript_mixedcontent.html
@@ -15,26 +15,26 @@
 <iframe></iframe>
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/importscript-mixedcontent/register.html";
+    iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/importscript-mixedcontent/register.html";
     var ios;
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/importscript-mixedcontent/index.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/importscript-mixedcontent/index.html";
       } else if (e.data.status == "done") {
         ok(e.data.data, "good", "Mixed content blocking should work correctly for service workers");
-        iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/fetch/importscript-mixedcontent/unregister.html";
+        iframe.src = "https://example.com/tests/dom/serviceworkers/test/fetch/importscript-mixedcontent/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
         window.onmessage = null;
         ok(true, "Test finished successfully");
         SimpleTest.finish();
       }
     };
   }
 
diff --git a/dom/serviceworkers/test/test_origin_after_redirect.html b/dom/serviceworkers/test/test_origin_after_redirect.html
--- a/dom/serviceworkers/test/test_origin_after_redirect.html
+++ b/dom/serviceworkers/test/test_origin_after_redirect.html
@@ -15,30 +15,30 @@
 <iframe></iframe>
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/origin/register.html";
+    iframe.src = "/tests/dom/serviceworkers/test/fetch/origin/register.html";
     var win;
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
-        win = window.open("/tests/dom/workers/test/serviceworkers/fetch/origin/index.sjs", "mywindow", "width=100,height=100");
+        win = window.open("/tests/dom/serviceworkers/test/fetch/origin/index.sjs", "mywindow", "width=100,height=100");
       } else if (e.data.status == "domain") {
         is(e.data.data, "example.org", "Correct domain expected");
       } else if (e.data.status == "origin") {
         is(e.data.data, "http://example.org", "Correct origin expected");
       } else if (e.data.status == "done") {
         win.close();
-        iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/origin/unregister.html";
+        iframe.src = "/tests/dom/serviceworkers/test/fetch/origin/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
         window.onmessage = null;
         ok(true, "Test finished successfully");
         SimpleTest.finish();
       }
     };
   }
 
diff --git a/dom/serviceworkers/test/test_origin_after_redirect_cached.html b/dom/serviceworkers/test/test_origin_after_redirect_cached.html
--- a/dom/serviceworkers/test/test_origin_after_redirect_cached.html
+++ b/dom/serviceworkers/test/test_origin_after_redirect_cached.html
@@ -15,30 +15,30 @@
 <iframe></iframe>
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/origin/register.html";
+    iframe.src = "/tests/dom/serviceworkers/test/fetch/origin/register.html";
     var win;
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
-        win = window.open("/tests/dom/workers/test/serviceworkers/fetch/origin/index-cached.sjs", "mywindow", "width=100,height=100");
+        win = window.open("/tests/dom/serviceworkers/test/fetch/origin/index-cached.sjs", "mywindow", "width=100,height=100");
       } else if (e.data.status == "domain") {
         is(e.data.data, "example.org", "Correct domain expected");
       } else if (e.data.status == "origin") {
         is(e.data.data, "http://example.org", "Correct origin expected");
       } else if (e.data.status == "done") {
         win.close();
-        iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/origin/unregister.html";
+        iframe.src = "/tests/dom/serviceworkers/test/fetch/origin/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
         window.onmessage = null;
         ok(true, "Test finished successfully");
         SimpleTest.finish();
       }
     };
   }
 
diff --git a/dom/serviceworkers/test/test_origin_after_redirect_to_https.html b/dom/serviceworkers/test/test_origin_after_redirect_to_https.html
--- a/dom/serviceworkers/test/test_origin_after_redirect_to_https.html
+++ b/dom/serviceworkers/test/test_origin_after_redirect_to_https.html
@@ -15,30 +15,30 @@
 <iframe></iframe>
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/origin/register.html";
+    iframe.src = "/tests/dom/serviceworkers/test/fetch/origin/register.html";
     var win;
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
-        win = window.open("/tests/dom/workers/test/serviceworkers/fetch/origin/index-to-https.sjs", "mywindow", "width=100,height=100");
+        win = window.open("/tests/dom/serviceworkers/test/fetch/origin/index-to-https.sjs", "mywindow", "width=100,height=100");
       } else if (e.data.status == "domain") {
         is(e.data.data, "example.org", "Correct domain expected");
       } else if (e.data.status == "origin") {
         is(e.data.data, "https://example.org", "Correct origin expected");
       } else if (e.data.status == "done") {
         win.close();
-        iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/origin/unregister.html";
+        iframe.src = "/tests/dom/serviceworkers/test/fetch/origin/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
         window.onmessage = null;
         ok(true, "Test finished successfully");
         SimpleTest.finish();
       }
     };
   }
 
diff --git a/dom/serviceworkers/test/test_origin_after_redirect_to_https_cached.html b/dom/serviceworkers/test/test_origin_after_redirect_to_https_cached.html
--- a/dom/serviceworkers/test/test_origin_after_redirect_to_https_cached.html
+++ b/dom/serviceworkers/test/test_origin_after_redirect_to_https_cached.html
@@ -15,30 +15,30 @@
 <iframe></iframe>
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
   function runTest() {
     iframe = document.querySelector("iframe");
-    iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/origin/register.html";
+    iframe.src = "/tests/dom/serviceworkers/test/fetch/origin/register.html";
     var win;
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
-        win = window.open("/tests/dom/workers/test/serviceworkers/fetch/origin/index-to-https-cached.sjs", "mywindow", "width=100,height=100");
+        win = window.open("/tests/dom/serviceworkers/test/fetch/origin/index-to-https-cached.sjs", "mywindow", "width=100,height=100");
       } else if (e.data.status == "domain") {
         is(e.data.data, "example.org", "Correct domain expected");
       } else if (e.data.status == "origin") {
         is(e.data.data, "https://example.org", "Correct origin expected");
       } else if (e.data.status == "done") {
         win.close();
-        iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/origin/unregister.html";
+        iframe.src = "/tests/dom/serviceworkers/test/fetch/origin/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
         window.onmessage = null;
         ok(true, "Test finished successfully");
         SimpleTest.finish();
       }
     };
   }
 
diff --git a/dom/serviceworkers/test/test_privateBrowsing.html b/dom/serviceworkers/test/test_privateBrowsing.html
--- a/dom/serviceworkers/test/test_privateBrowsing.html
+++ b/dom/serviceworkers/test/test_privateBrowsing.html
@@ -6,17 +6,17 @@
 </head>
 <body>
 
 <script type="application/javascript">
 
 var mainWindow;
 
 var contentPage = "http://mochi.test:8888/chrome/dom/workers/test/empty.html";
-var workerScope = "http://mochi.test:8888/chrome/dom/workers/test/serviceworkers/";
+var workerScope = "http://mochi.test:8888/chrome/dom/serviceworkers/test/";
 var workerURL = workerScope + "worker.js";
 
 function testOnWindow(aIsPrivate, aCallback) {
   var win = mainWindow.OpenBrowserWindow({private: aIsPrivate});
   win.addEventListener("load", function() {
     win.addEventListener("DOMContentLoaded", function onInnerLoad() {
       if (win.content.location.href != contentPage) {
         win.gBrowser.loadURI(contentPage);
diff --git a/dom/serviceworkers/test/test_register_base.html b/dom/serviceworkers/test/test_register_base.html
--- a/dom/serviceworkers/test/test_register_base.html
+++ b/dom/serviceworkers/test/test_register_base.html
@@ -13,17 +13,17 @@
 <body>
 <p id="display"></p>
 <div id="content" style="display: none">
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   function runTest() {
-    navigator.serviceWorker.register("http://mochi.test:8888/tests/dom/workers/test/serviceworkers/empty.js")
+    navigator.serviceWorker.register("http://mochi.test:8888/tests/dom/serviceworkers/test/empty.js")
       .then(reg => {
         ok(false, "Register should fail");
         SimpleTest.finish();
       }, err => {
         is(err.name, "SecurityError", "Registration should fail with SecurityError");
         SimpleTest.finish();
       });
   }
diff --git a/dom/serviceworkers/test/test_register_https_in_http.html b/dom/serviceworkers/test/test_register_https_in_http.html
--- a/dom/serviceworkers/test/test_register_https_in_http.html
+++ b/dom/serviceworkers/test/test_register_https_in_http.html
@@ -13,17 +13,17 @@
 <p id="display"></p>
 <div id="content" style="display: none">
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   function runTest() {
     var iframe = document.createElement("iframe");
-    iframe.src = "https://example.com/tests/dom/workers/test/serviceworkers/register_https.html";
+    iframe.src = "https://example.com/tests/dom/serviceworkers/test/register_https.html";
     document.body.appendChild(iframe);
 
     window.onmessage = event => {
       switch (event.data.type) {
       case "ok":
         ok(event.data.status, event.data.msg);
         break;
       case "done":
diff --git a/dom/serviceworkers/test/test_request_context.js b/dom/serviceworkers/test/test_request_context.js
--- a/dom/serviceworkers/test/test_request_context.js
+++ b/dom/serviceworkers/test/test_request_context.js
@@ -34,26 +34,26 @@ function isMulet() {
   } catch(e) {
     return false;
   }
 }
 
 var iframe;
 function runTest() {
   iframe = document.querySelector("iframe");
-  iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/context/register.html";
+  iframe.src = "/tests/dom/serviceworkers/test/fetch/context/register.html";
   window.onmessage = function(e) {
     if (e.data.status == "ok") {
       ok(e.data.result, e.data.message);
     } else if (e.data.status == "todo") {
       todo(e.data.result, e.data.message);
     } else if (e.data.status == "registrationdone") {
-      iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/context/index.html?" + gTest;
+      iframe.src = "/tests/dom/serviceworkers/test/fetch/context/index.html?" + gTest;
     } else if (e.data.status == "done") {
-      iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/context/unregister.html";
+      iframe.src = "/tests/dom/serviceworkers/test/fetch/context/unregister.html";
     } else if (e.data.status == "unregistrationdone") {
       window.onmessage = null;
       ok(true, "Test finished successfully");
       SimpleTest.finish();
     }
   };
 }
 
diff --git a/dom/serviceworkers/test/test_sandbox_intercept.html b/dom/serviceworkers/test/test_sandbox_intercept.html
--- a/dom/serviceworkers/test/test_sandbox_intercept.html
+++ b/dom/serviceworkers/test/test_sandbox_intercept.html
@@ -18,26 +18,26 @@
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var normalFrame;
   var sandboxFrame;
   function runTest() {
     normalFrame = document.getElementById("normal-frame");
     sandboxFrame = document.getElementById("sandbox-frame");
-    normalFrame.src = "/tests/dom/workers/test/serviceworkers/fetch/sandbox/register.html";
+    normalFrame.src = "/tests/dom/serviceworkers/test/fetch/sandbox/register.html";
     window.onmessage = function(e) {
       if (e.data.status == "ok") {
         ok(e.data.result, e.data.message);
       } else if (e.data.status == "registrationdone") {
         normalFrame.src = "about:blank";
-        sandboxFrame.src = "/tests/dom/workers/test/serviceworkers/fetch/sandbox/index.html";
+        sandboxFrame.src = "/tests/dom/serviceworkers/test/fetch/sandbox/index.html";
       } else if (e.data.status == "done") {
         sandboxFrame.src = "about:blank";
-        normalFrame.src = "/tests/dom/workers/test/serviceworkers/fetch/sandbox/unregister.html";
+        normalFrame.src = "/tests/dom/serviceworkers/test/fetch/sandbox/unregister.html";
       } else if (e.data.status == "unregistrationdone") {
         normalFrame.src = "about:blank";
         window.onmessage = null;
         ok(true, "Test finished successfully");
         SimpleTest.finish();
       }
     };
   }
diff --git a/dom/serviceworkers/test/test_sanitize_domain.html b/dom/serviceworkers/test/test_sanitize_domain.html
--- a/dom/serviceworkers/test/test_sanitize_domain.html
+++ b/dom/serviceworkers/test/test_sanitize_domain.html
@@ -15,31 +15,31 @@
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   function start() {
     const Cc = SpecialPowers.Cc;
     const Ci = SpecialPowers.Ci;
 
     function checkDomainRegistration(domain, exists) {
-      return testFrame("http://" + domain + "/tests/dom/workers/test/serviceworkers/sanitize/example_check_and_unregister.html").then(function(body) {
+      return testFrame("http://" + domain + "/tests/dom/serviceworkers/test/sanitize/example_check_and_unregister.html").then(function(body) {
         if (body === "FAIL") {
           ok(false, "Error acquiring registration or unregistering for " + domain);
         } else {
           if (exists) {
             ok(body === true, "Expected " + domain + " to still have a registration.");
           } else {
             ok(body === false, "Expected " + domain + " to have no registration.");
           }
         }
       });
     }
 
     registerSW().then(function() {
-      return testFrame("http://example.com/tests/dom/workers/test/serviceworkers/sanitize/frame.html").then(function(body) {
+      return testFrame("http://example.com/tests/dom/serviceworkers/test/sanitize/frame.html").then(function(body) {
         is(body, "intercepted", "Expected serviceworker to intercept request");
       });
     }).then(function() {
       SpecialPowers.removeServiceWorkerDataForExampleDomain();
     }).then(function() {
       return checkDomainRegistration("prefixexample.com", true /* exists */)
         .then(function(e) {
           return checkDomainRegistration("example.com", false /* exists */);
@@ -62,20 +62,20 @@
           resolve(message.data);
         });
       };
       document.body.appendChild(iframe);
     });
   }
 
   function registerSW() {
-    return testFrame("http://example.com/tests/dom/workers/test/serviceworkers/sanitize/register.html")
+    return testFrame("http://example.com/tests/dom/serviceworkers/test/sanitize/register.html")
            .then(function(e) {
               // Register for prefixexample.com and then ensure it does not get unregistered.
-              return testFrame("http://prefixexample.com/tests/dom/workers/test/serviceworkers/sanitize/register.html");
+              return testFrame("http://prefixexample.com/tests/dom/serviceworkers/test/sanitize/register.html");
             });
   }
 
   SimpleTest.waitForExplicitFinish();
 
   SpecialPowers.pushPrefEnv({"set": [
     ["dom.serviceWorkers.exemptFromPerDomainMax", true],
     ["dom.serviceWorkers.enabled", true],
diff --git a/dom/serviceworkers/test/test_script_loader_intercepted_js_cache.html b/dom/serviceworkers/test/test_script_loader_intercepted_js_cache.html
--- a/dom/serviceworkers/test/test_script_loader_intercepted_js_cache.html
+++ b/dom/serviceworkers/test/test_script_loader_intercepted_js_cache.html
@@ -42,17 +42,17 @@
             }
           }
         },
         "scriptloader_execute": "bytecode_exec"
       }
     };
 
     var gScript = SpecialPowers.
-      loadChromeScript('http://mochi.test:8888/tests/dom/workers/test/serviceworkers/file_js_cache_cleanup.js');
+      loadChromeScript('http://mochi.test:8888/tests/dom/serviceworkers/test/file_js_cache_cleanup.js');
 
     function WaitForScriptTagEvent(url) {
       var iframe = document.createElement("iframe");
       document.body.appendChild(iframe);
 
       var stateMachine = scriptLoaderStateMachine;
       var stateHistory = [];
       var stateMachineResolve, stateMachineReject;
diff --git a/dom/serviceworkers/test/test_serviceworker_header.html b/dom/serviceworkers/test/test_serviceworker_header.html
--- a/dom/serviceworkers/test/test_serviceworker_header.html
+++ b/dom/serviceworkers/test/test_serviceworker_header.html
@@ -13,17 +13,17 @@
 <body>
 <p id="display"></p>
 <div id="content" style="display: none">
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   function runTest() {
-    navigator.serviceWorker.register("http://mochi.test:8888/tests/dom/workers/test/serviceworkers/header_checker.sjs")
+    navigator.serviceWorker.register("http://mochi.test:8888/tests/dom/serviceworkers/test/header_checker.sjs")
       .then(reg => {
         ok(true, "Register should succeed");
         reg.unregister().then(() => SimpleTest.finish());
       }, err => {
         ok(false, "Register should not fail");
         SimpleTest.finish();
       });
   }
diff --git a/dom/serviceworkers/test/test_serviceworker_not_sharedworker.html b/dom/serviceworkers/test/test_serviceworker_not_sharedworker.html
--- a/dom/serviceworkers/test/test_serviceworker_not_sharedworker.html
+++ b/dom/serviceworkers/test/test_serviceworker_not_sharedworker.html
@@ -13,17 +13,17 @@
 <p id="display"></p>
 <div id="content" style="display: none">
 <iframe></iframe>
 </div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   var iframe;
-  const SCOPE = "http://mochi.test:8888/tests/dom/workers/test/serviceworkers/";
+  const SCOPE = "http://mochi.test:8888/tests/dom/serviceworkers/test/";
   function runTest() {
     navigator.serviceWorker.ready.then(setupSW);
     navigator.serviceWorker.register("serviceworker_not_sharedworker.js",
                                      {scope: SCOPE});
   }
 
   var sw, worker;
   function setupSW(registration) {
diff --git a/dom/serviceworkers/test/test_third_party_iframes.html b/dom/serviceworkers/test/test_third_party_iframes.html
--- a/dom/serviceworkers/test/test_third_party_iframes.html
+++ b/dom/serviceworkers/test/test_third_party_iframes.html
@@ -34,17 +34,17 @@ function next() {
   } catch(ex) {
     ok(false, "Caught exception", ex);
   }
 }
 
 onload = next;
 
 let iframe;
-let basePath = "/tests/dom/workers/test/serviceworkers/thirdparty/";
+let basePath = "/tests/dom/serviceworkers/test/thirdparty/";
 let origin = window.location.protocol + "//" + window.location.host;
 let thirdPartyOrigin = "https://example.com";
 
 function testIframeLoaded() {
   ok(true, "Iframe loaded");
   iframe.removeEventListener("load", testIframeLoaded);
   let message = {
     source: "parent",
diff --git a/dom/serviceworkers/test/test_update_missing_imported_script.html b/dom/serviceworkers/test/test_update_missing_imported_script.html
--- a/dom/serviceworkers/test/test_update_missing_imported_script.html
+++ b/dom/serviceworkers/test/test_update_missing_imported_script.html
@@ -18,18 +18,18 @@
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
   // We have the iframe register for its own scope so that this page is not
   // holding any references when we GC.
   function register() {
     return Promise.resolve()
       .then(_ => navigator.serviceWorker.register("http://mochi.test:8888/" +
-                                                  "tests/dom/workers/test/" +
-                                                  "serviceworkers/" +
+                                                  "tests/dom/serviceworkers/" +
+                                                  "test/" +
                                                   "bug1290951_worker_main.sjs"))
       .then(r => {
         ok(r, "Should be a registration.");
 
         // Get the newest worker.
         var worker = r.installing || r.waiting || r.active;
 
         // Wait for the worker becoming active.
diff --git a/dom/serviceworkers/test/xslt_worker.js b/dom/serviceworkers/test/xslt_worker.js
--- a/dom/serviceworkers/test/xslt_worker.js
+++ b/dom/serviceworkers/test/xslt_worker.js
@@ -24,26 +24,26 @@ onfetch = function(event) {
       ));
     }
     else if (testType == 'cors') {
       if (event.request.mode != 'cors') {
         event.respondWith(Response.error());
         return;
       }
 
-      var url = "http://example.com/tests/dom/workers/test/serviceworkers/xslt/xslt.sjs?" + escape(xslt);
+      var url = "http://example.com/tests/dom/serviceworkers/test/xslt/xslt.sjs?" + escape(xslt);
       event.respondWith(fetch(url, { mode: 'cors' }));
     }
     else if (testType == 'opaque') {
       if (event.request.mode != 'cors') {
         event.respondWith(Response.error());
         return;
       }
 
-      var url = "http://example.com/tests/dom/workers/test/serviceworkers/xslt/xslt.sjs?" + escape(xslt);
+      var url = "http://example.com/tests/dom/serviceworkers/test/xslt/xslt.sjs?" + escape(xslt);
       event.respondWith(fetch(url, { mode: 'no-cors' }));
     }
     else {
       event.respondWith(Response.error());
     }
   }
 };