diff --git a/dom/workers/test/serviceworkers/browser.ini b/dom/workers/test/serviceworkers/browser.ini
index 106bf096cf3..c0aae30d68f 100644
--- a/dom/workers/test/serviceworkers/browser.ini
+++ b/dom/workers/test/serviceworkers/browser.ini
@@ -2,8 +2,8 @@
 support-files =
   browser_base_force_refresh.html
   browser_cached_force_refresh.html
-  download_window.html
-  download_worker.js
+  download/window.html
+  download/worker.js
   force_refresh_browser_worker.js
 
 [browser_force_refresh.js]
diff --git a/dom/workers/test/serviceworkers/browser_download.js b/dom/workers/test/serviceworkers/browser_download.js
index 94aafbf3475..f5f2765b8bb 100644
--- a/dom/workers/test/serviceworkers/browser_download.js
+++ b/dom/workers/test/serviceworkers/browser_download.js
@@ -48,7 +48,7 @@ function test() {
                                      ['dom.serviceWorkers.testing.enabled', true],
                                      ['dom.serviceWorkers.interception.enabled', true]]},
                             function() {
-    var url = gTestRoot + 'download_window.html';
+    var url = gTestRoot + 'download/window.html';
     var tab = gBrowser.addTab();
     gBrowser.selectedTab = tab;
 
diff --git a/dom/workers/test/serviceworkers/download_window.html b/dom/workers/test/serviceworkers/download/window.html
similarity index 94%
rename from dom/workers/test/serviceworkers/download_window.html
rename to dom/workers/test/serviceworkers/download/window.html
index 335ed29fc20..7d7893e0e61 100644
--- a/dom/workers/test/serviceworkers/download_window.html
+++ b/dom/workers/test/serviceworkers/download/window.html
@@ -24,7 +24,7 @@ function wait_until_controlled() {
 }
 addEventListener('load', function(event) {
   var registration;
-  navigator.serviceWorker.register('download_worker.js').then(function(swr) {
+  navigator.serviceWorker.register('worker.js').then(function(swr) {
     registration = swr;
 
     // While the iframe below is a navigation, we still wait until we are
diff --git a/dom/workers/test/serviceworkers/download_worker.js b/dom/workers/test/serviceworkers/download/worker.js
similarity index 100%
rename from dom/workers/test/serviceworkers/download_worker.js
rename to dom/workers/test/serviceworkers/download/worker.js