diff --git a/editor/libeditor/crashtests/1444630.html b/editor/libeditor/crashtests/1444630.html
index eb0e707fb1cd..4c86cf39a66a 100644
--- a/editor/libeditor/crashtests/1444630.html
+++ b/editor/libeditor/crashtests/1444630.html
@@ -7,8 +7,7 @@ function load()
   let textarea = document.getElementById("editor");
   textarea.focus();
 
-  SpecialPowers.Cu.import(
-    "chrome://reftest/content/AsyncSpellCheckTestHelper.jsm")
+  SpecialPowers.Cu.import("resource://reftest/AsyncSpellCheckTestHelper.jsm")
   .onSpellCheck(textarea, () => {
     let isc = SpecialPowers.wrap(textarea).editor.getInlineSpellChecker(false);
     let sc = isc.spellChecker;
diff --git a/editor/reftests/xul/autocomplete-ref.xul b/editor/reftests/xul/autocomplete-ref.xul
index 92c9997b5cf9..7c3afec3a6d4 100644
--- a/editor/reftests/xul/autocomplete-ref.xul
+++ b/editor/reftests/xul/autocomplete-ref.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://reftest/content/input.css" type="text/css"?>
+<?xml-stylesheet href="resource://reftest/input.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/editor/reftests/xul/empty-ref.xul b/editor/reftests/xul/empty-ref.xul
index 4f3da9647f6f..b5700fc15810 100644
--- a/editor/reftests/xul/empty-ref.xul
+++ b/editor/reftests/xul/empty-ref.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://reftest/content/input.css" type="text/css"?>
+<?xml-stylesheet href="resource://reftest/input.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/editor/reftests/xul/emptyautocomplete-ref.xul b/editor/reftests/xul/emptyautocomplete-ref.xul
index 777df4f043c6..62da03b06b11 100644
--- a/editor/reftests/xul/emptyautocomplete-ref.xul
+++ b/editor/reftests/xul/emptyautocomplete-ref.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://reftest/content/input.css" type="text/css"?>
+<?xml-stylesheet href="resource://reftest/input.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/editor/reftests/xul/emptymultiline-1.xul b/editor/reftests/xul/emptymultiline-1.xul
index cb73d7199430..67de0058cf07 100644
--- a/editor/reftests/xul/emptymultiline-1.xul
+++ b/editor/reftests/xul/emptymultiline-1.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://reftest/content/input.css" type="text/css"?>
+<?xml-stylesheet href="resource://reftest/input.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/editor/reftests/xul/emptymultiline-2.xul b/editor/reftests/xul/emptymultiline-2.xul
index 741d596113cf..b9ffae042096 100644
--- a/editor/reftests/xul/emptymultiline-2.xul
+++ b/editor/reftests/xul/emptymultiline-2.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://reftest/content/input.css" type="text/css"?>
+<?xml-stylesheet href="resource://reftest/input.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/editor/reftests/xul/emptymultiline-ref.xul b/editor/reftests/xul/emptymultiline-ref.xul
index ce942db77840..34dfe7134a10 100644
--- a/editor/reftests/xul/emptymultiline-ref.xul
+++ b/editor/reftests/xul/emptymultiline-ref.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://reftest/content/input.css" type="text/css"?>
+<?xml-stylesheet href="resource://reftest/input.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/editor/reftests/xul/emptytextbox-ref.xul b/editor/reftests/xul/emptytextbox-ref.xul
index 60b223595443..eb48d52d79eb 100644
--- a/editor/reftests/xul/emptytextbox-ref.xul
+++ b/editor/reftests/xul/emptytextbox-ref.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://reftest/content/input.css" type="text/css"?>
+<?xml-stylesheet href="resource://reftest/input.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/editor/reftests/xul/number-ref.xul b/editor/reftests/xul/number-ref.xul
index 40a50c0bcefe..c5960515e186 100644
--- a/editor/reftests/xul/number-ref.xul
+++ b/editor/reftests/xul/number-ref.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://reftest/content/input.css" type="text/css"?>
+<?xml-stylesheet href="resource://reftest/input.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/editor/reftests/xul/numberwithvalue-ref.xul b/editor/reftests/xul/numberwithvalue-ref.xul
index a1b863c3d0a4..79f1c9baefe2 100644
--- a/editor/reftests/xul/numberwithvalue-ref.xul
+++ b/editor/reftests/xul/numberwithvalue-ref.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://reftest/content/input.css" type="text/css"?>
+<?xml-stylesheet href="resource://reftest/input.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/editor/reftests/xul/passwd-ref.xul b/editor/reftests/xul/passwd-ref.xul
index 60c3bf046eea..3709d3fbbb91 100644
--- a/editor/reftests/xul/passwd-ref.xul
+++ b/editor/reftests/xul/passwd-ref.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://reftest/content/input.css" type="text/css"?>
+<?xml-stylesheet href="resource://reftest/input.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/editor/reftests/xul/plain-ref.xul b/editor/reftests/xul/plain-ref.xul
index d7d5fbbeca18..6c021d674271 100644
--- a/editor/reftests/xul/plain-ref.xul
+++ b/editor/reftests/xul/plain-ref.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://reftest/content/input.css" type="text/css"?>
+<?xml-stylesheet href="resource://reftest/input.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/editor/reftests/xul/textbox-ref.xul b/editor/reftests/xul/textbox-ref.xul
index dd7acc38d559..6e60eff8b78d 100644
--- a/editor/reftests/xul/textbox-ref.xul
+++ b/editor/reftests/xul/textbox-ref.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://reftest/content/input.css" type="text/css"?>
+<?xml-stylesheet href="resource://reftest/input.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/layout/reftests/forms/progress/bar-pseudo-element-ref.html b/layout/reftests/forms/progress/bar-pseudo-element-ref.html
index ed4b215ea6e7..9d8d96a41a90 100644
--- a/layout/reftests/forms/progress/bar-pseudo-element-ref.html
+++ b/layout/reftests/forms/progress/bar-pseudo-element-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     body > div:nth-child(1) > .progress-bar { margin: 10px; padding: 0px; }
     body > div:nth-child(2) > .progress-bar { margin: 0px; padding: 10px; }
diff --git a/layout/reftests/forms/progress/bar-pseudo-element-rtl-ref.html b/layout/reftests/forms/progress/bar-pseudo-element-rtl-ref.html
index 11bc76f1e38b..c25a143dbf65 100644
--- a/layout/reftests/forms/progress/bar-pseudo-element-rtl-ref.html
+++ b/layout/reftests/forms/progress/bar-pseudo-element-rtl-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     body > div:nth-child(1) > .progress-bar { margin: 0px 10px 0px 0px; padding: 0px; }
     body > div:nth-child(2) > .progress-bar { margin: 0px 0px 0px 10px; padding: 0px; }
diff --git a/layout/reftests/forms/progress/bar-pseudo-element-vertical-ref.html b/layout/reftests/forms/progress/bar-pseudo-element-vertical-ref.html
index 4ee6b4663212..4f28e3aceb52 100644
--- a/layout/reftests/forms/progress/bar-pseudo-element-vertical-ref.html
+++ b/layout/reftests/forms/progress/bar-pseudo-element-vertical-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     .progress-element { margin: 10px; }
     body > div:nth-child(1) > .progress-bar { position: relative; top: 4px; left: 4px;
diff --git a/layout/reftests/forms/progress/bar-pseudo-element-vertical-rtl-ref.html b/layout/reftests/forms/progress/bar-pseudo-element-vertical-rtl-ref.html
index 0bb86b43effa..d69b8b1e5766 100644
--- a/layout/reftests/forms/progress/bar-pseudo-element-vertical-rtl-ref.html
+++ b/layout/reftests/forms/progress/bar-pseudo-element-vertical-rtl-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     .progress-element { margin: 10px; }
     body > div:nth-child(1) > .progress-bar { position: relative; top: 4px; left: 4px;
diff --git a/layout/reftests/forms/progress/block-invalidate-ref.html b/layout/reftests/forms/progress/block-invalidate-ref.html
index 8f32a5ae50a7..60f14f134949 100644
--- a/layout/reftests/forms/progress/block-invalidate-ref.html
+++ b/layout/reftests/forms/progress/block-invalidate-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     progress { display: block; }
   </style>
diff --git a/layout/reftests/forms/progress/in-cells-ref.html b/layout/reftests/forms/progress/in-cells-ref.html
index db8ace4387ab..08917e43f4a0 100644
--- a/layout/reftests/forms/progress/in-cells-ref.html
+++ b/layout/reftests/forms/progress/in-cells-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     progress { width: 10em; height: 1em; }
     progress.vertical { -moz-orient: vertical; width: 1em; height: 10em; }
diff --git a/layout/reftests/forms/progress/indeterminate-style-height-ref.html b/layout/reftests/forms/progress/indeterminate-style-height-ref.html
index da37560bcae7..2a9eafa31582 100644
--- a/layout/reftests/forms/progress/indeterminate-style-height-ref.html
+++ b/layout/reftests/forms/progress/indeterminate-style-height-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     div.progress-element {
       height: 12em;
diff --git a/layout/reftests/forms/progress/indeterminate-style-width-ref.html b/layout/reftests/forms/progress/indeterminate-style-width-ref.html
index a11b4f153da7..7f67f946e0ce 100644
--- a/layout/reftests/forms/progress/indeterminate-style-width-ref.html
+++ b/layout/reftests/forms/progress/indeterminate-style-width-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     div.progress-bar {
       width:100%;
diff --git a/layout/reftests/forms/progress/margin-padding-ref.html b/layout/reftests/forms/progress/margin-padding-ref.html
index 52a5bb0fda72..5a64e6d2de1f 100644
--- a/layout/reftests/forms/progress/margin-padding-ref.html
+++ b/layout/reftests/forms/progress/margin-padding-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     body > div:nth-child(1) { margin: 10px; padding: 0px; }
     body > div:nth-child(2) { margin: 0px; padding: 10px; }
diff --git a/layout/reftests/forms/progress/margin-padding-rtl-ref.html b/layout/reftests/forms/progress/margin-padding-rtl-ref.html
index f484fb6553c0..bef9c572769b 100644
--- a/layout/reftests/forms/progress/margin-padding-rtl-ref.html
+++ b/layout/reftests/forms/progress/margin-padding-rtl-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     body > div:nth-child(1) { margin: 10px; padding: 0px; }
     body > div:nth-child(2) { margin: 0px; padding: 10px; }
diff --git a/layout/reftests/forms/progress/margin-padding-vertical-ref.html b/layout/reftests/forms/progress/margin-padding-vertical-ref.html
index bc11543fc52b..2dea7af5113f 100644
--- a/layout/reftests/forms/progress/margin-padding-vertical-ref.html
+++ b/layout/reftests/forms/progress/margin-padding-vertical-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     body > div:nth-child(1) { margin: 10px; padding: 0px; }
     body > div:nth-child(2) { margin: 0px; padding: 10px; }
diff --git a/layout/reftests/forms/progress/margin-padding-vertical-rtl-ref.html b/layout/reftests/forms/progress/margin-padding-vertical-rtl-ref.html
index 8e1815eb7bd5..4ded227febed 100644
--- a/layout/reftests/forms/progress/margin-padding-vertical-rtl-ref.html
+++ b/layout/reftests/forms/progress/margin-padding-vertical-rtl-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     body > div:nth-child(1) { margin: 10px; padding: 0px; }
     body > div:nth-child(2) { margin: 0px; padding: 10px; }
diff --git a/layout/reftests/forms/progress/transformations-ref.html b/layout/reftests/forms/progress/transformations-ref.html
index 54aa2bde8ad5..dc0a246a3e06 100644
--- a/layout/reftests/forms/progress/transformations-ref.html
+++ b/layout/reftests/forms/progress/transformations-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     body > div:nth-child(1) { -moz-transform: matrix(1, -0.2, 0, 1, 0, 0); }
     body > div:nth-child(2) { -moz-transform: translateX(15em) matrix(1, 0, 0.6, 1, 0, 0); }
diff --git a/layout/reftests/forms/progress/values-ref.html b/layout/reftests/forms/progress/values-ref.html
index 5905c69c52f8..d3c15bc8fb59 100644
--- a/layout/reftests/forms/progress/values-ref.html
+++ b/layout/reftests/forms/progress/values-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     div:nth-child(1) > .progress-bar { width: 100%; }
     div:nth-child(2) > .progress-bar { width: 0%; }
diff --git a/layout/reftests/forms/progress/values-rtl-ref.html b/layout/reftests/forms/progress/values-rtl-ref.html
index 8921496b833d..6787af2d70e1 100644
--- a/layout/reftests/forms/progress/values-rtl-ref.html
+++ b/layout/reftests/forms/progress/values-rtl-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     div:nth-child(1) > .progress-bar { width: 100%; }
     div:nth-child(2) > .progress-bar { width: 0%; }
diff --git a/layout/reftests/forms/progress/values-vertical-ref.html b/layout/reftests/forms/progress/values-vertical-ref.html
index a529eac39141..43b3f7e20c4c 100644
--- a/layout/reftests/forms/progress/values-vertical-ref.html
+++ b/layout/reftests/forms/progress/values-vertical-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     div:nth-child(1) > .progress-bar { position: relative; top: 0%; height: 100%; }
     div:nth-child(2) > .progress-bar { position: relative; top: 100%; height: 0%; }
diff --git a/layout/reftests/forms/progress/values-vertical-rtl-ref.html b/layout/reftests/forms/progress/values-vertical-rtl-ref.html
index 03db5027677b..88934c487660 100644
--- a/layout/reftests/forms/progress/values-vertical-rtl-ref.html
+++ b/layout/reftests/forms/progress/values-vertical-rtl-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     div:nth-child(1) > .progress-bar { position: relative; top: 0%; height: 100%; }
     div:nth-child(2) > .progress-bar { position: relative; top: 100%; height: 0%; }
diff --git a/layout/tools/reftest/bootstrap.js b/layout/tools/reftest/bootstrap.js
index 40118f222e45..b09aeaef48bc 100644
--- a/layout/tools/reftest/bootstrap.js
+++ b/layout/tools/reftest/bootstrap.js
@@ -28,7 +28,7 @@ var WindowListener = {
         break;
       }
 
-      ChromeUtils.import("chrome://reftest/content/reftest.jsm");
+      ChromeUtils.import("resource://reftest/reftest.jsm");
       win.addEventListener("pageshow", function() {
         // Add setTimeout here because windows.innerWidth/Height are not set yet.
         win.setTimeout(function() {OnRefTestLoad(win);}, 0);
@@ -44,6 +44,11 @@ function startup(data, reason) {
     return;
   }
 
+  let resProto = Cc["@mozilla.org/network/protocol;1?name=resource"]
+                             .getService(Ci.nsISubstitutingProtocolHandler);
+  let uri = Services.io.newURI("chrome/reftest/res/", null, data.resourceURI);
+  resProto.setSubstitutionWithFlags("reftest", uri, resProto.ALLOW_CONTENT_ACCESS);
+
   let orig = Services.wm.getMostRecentWindow("navigator:browser");
 
   let ios = Cc["@mozilla.org/network/io-service;1"]
@@ -59,7 +64,7 @@ function startup(data, reason) {
     // Close pre-existing window
     orig.close();
 
-    ChromeUtils.import("chrome://reftest/content/PerTestCoverageUtils.jsm");
+    ChromeUtils.import("resource://reftest/PerTestCoverageUtils.jsm");
     if (PerTestCoverageUtils.enabled) {
       // In PerTestCoverage mode, wait for the process belonging to the window we just closed
       // to be terminated, to avoid its shutdown interfering when we reset the counters.
@@ -77,7 +82,7 @@ function shutdown(data, reason) {
     Services.wm.removeListener(WindowListener);
     Cm.removedBootstrappedManifestLocation(data.installPath);
     OnRefTestUnload();
-    Cu.unload("chrome://reftest/content/reftest.jsm");
+    Cu.unload("resource://reftest/reftest.jsm");
   }
 }
 
diff --git a/layout/tools/reftest/jar.mn b/layout/tools/reftest/jar.mn
index c5431eac5ea1..6facee8e86cf 100644
--- a/layout/tools/reftest/jar.mn
+++ b/layout/tools/reftest/jar.mn
@@ -1,14 +1,15 @@
 reftest.jar:
 % content reftest %content/ contentaccessible=yes
-  content/globals.jsm (globals.jsm)
-  content/reftest-content.js (reftest-content.js)
-  content/AsyncSpellCheckTestHelper.jsm (../../../editor/AsyncSpellCheckTestHelper.jsm)
-  content/httpd.jsm (../../../netwerk/test/httpserver/httpd.js)
-  content/StructuredLog.jsm (../../../testing/modules/StructuredLog.jsm)
-  content/PerTestCoverageUtils.jsm (../../../tools/code-coverage/PerTestCoverageUtils.jsm)
-  content/input.css (../../../editor/reftests/xul/input.css)
   content/moz-bool-pref.css (../../../layout/reftests/css-parsing/moz-bool-pref.css)
-  content/progress.css (../../../layout/reftests/forms/progress/style.css)
-*  content/manifest.jsm (manifest.jsm)
-*  content/reftest.jsm (reftest.jsm)
   content/reftest.xul (reftest.xul)
+
+  res/globals.jsm (globals.jsm)
+  res/reftest-content.js (reftest-content.js)
+  res/AsyncSpellCheckTestHelper.jsm (../../../editor/AsyncSpellCheckTestHelper.jsm)
+  res/httpd.jsm (../../../netwerk/test/httpserver/httpd.js)
+  res/StructuredLog.jsm (../../../testing/modules/StructuredLog.jsm)
+  res/PerTestCoverageUtils.jsm (../../../tools/code-coverage/PerTestCoverageUtils.jsm)
+  res/input.css (../../../editor/reftests/xul/input.css)
+  res/progress.css (../../../layout/reftests/forms/progress/style.css)
+*  res/manifest.jsm (manifest.jsm)
+*  res/reftest.jsm (reftest.jsm)
diff --git a/layout/tools/reftest/manifest.jsm b/layout/tools/reftest/manifest.jsm
index d2a39494d1db..393cc902cad5 100644
--- a/layout/tools/reftest/manifest.jsm
+++ b/layout/tools/reftest/manifest.jsm
@@ -7,8 +7,8 @@
 
 var EXPORTED_SYMBOLS = ["ReadTopManifest", "CreateUrls"];
 
-Cu.import("chrome://reftest/content/globals.jsm", this);
-Cu.import("chrome://reftest/content/reftest.jsm", this);
+Cu.import("resource://reftest/globals.jsm", this);
+Cu.import("resource://reftest/reftest.jsm", this);
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 
diff --git a/layout/tools/reftest/reftest-content.js b/layout/tools/reftest/reftest-content.js
index f7656d1ae029..ff715dc641d9 100644
--- a/layout/tools/reftest/reftest-content.js
+++ b/layout/tools/reftest/reftest-content.js
@@ -17,7 +17,7 @@ const IO_SERVICE_CONTRACTID = "@mozilla.org/network/io-service;1"
 const BLANK_URL_FOR_CLEARING = "data:text/html;charset=UTF-8,%3C%21%2D%2DCLEAR%2D%2D%3E";
 
 Cu.import("resource://gre/modules/Timer.jsm");
-Cu.import("chrome://reftest/content/AsyncSpellCheckTestHelper.jsm");
+Cu.import("resource://reftest/AsyncSpellCheckTestHelper.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 var gBrowserIsRemote;
diff --git a/layout/tools/reftest/reftest.jsm b/layout/tools/reftest/reftest.jsm
index ee6c872cdf44..439cb0a8ed70 100644
--- a/layout/tools/reftest/reftest.jsm
+++ b/layout/tools/reftest/reftest.jsm
@@ -12,11 +12,11 @@ var EXPORTED_SYMBOLS = [
 ];
 
 Cu.import("resource://gre/modules/FileUtils.jsm");
-Cu.import("chrome://reftest/content/globals.jsm", this);
-Cu.import("chrome://reftest/content/httpd.jsm", this);
-Cu.import("chrome://reftest/content/manifest.jsm", this);
-Cu.import("chrome://reftest/content/StructuredLog.jsm", this);
-Cu.import("chrome://reftest/content/PerTestCoverageUtils.jsm", this);
+Cu.import("resource://reftest/globals.jsm", this);
+Cu.import("resource://reftest/httpd.jsm", this);
+Cu.import("resource://reftest/manifest.jsm", this);
+Cu.import("resource://reftest/StructuredLog.jsm", this);
+Cu.import("resource://reftest/PerTestCoverageUtils.jsm", this);
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
@@ -1455,7 +1455,7 @@ function RegisterMessageListenersAndLoadContentScript()
         function (m) { RecvExpectProcessCrash(); }
     );
 
-    g.browserMessageManager.loadFrameScript("chrome://reftest/content/reftest-content.js", true, true);
+    g.browserMessageManager.loadFrameScript("resource://reftest/reftest-content.js", true, true);
 }
 
 function RecvAssertionCount(count)
diff --git a/layout/tools/reftest/reftest.xul b/layout/tools/reftest/reftest.xul
index ae5355d20d8e..5959fcf977c6 100644
--- a/layout/tools/reftest/reftest.xul
+++ b/layout/tools/reftest/reftest.xul
@@ -9,6 +9,6 @@
         onunload="OnRefTestUnload();"
         style="background:white; overflow:hidden"
         >
-    <script type="application/ecmascript" src="reftest.jsm" />
+    <script type="application/ecmascript" src="resource://reftest/reftest.jsm" />
     <!-- The reftest browser element is dynamically created, here -->
 </window>
diff --git a/widget/reftests/progressbar-fallback-default-style-ref.html b/widget/reftests/progressbar-fallback-default-style-ref.html
index 94439caf5f10..22950ec583bc 100644
--- a/widget/reftests/progressbar-fallback-default-style-ref.html
+++ b/widget/reftests/progressbar-fallback-default-style-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <link rel='stylesheet' href='chrome://reftest/content/progress.css'>
+  <link rel='stylesheet' href='resource://reftest/progress.css'>
   <style>
     div.progress-element { padding: 5px; }
     body > div:nth-child(1)  { -moz-appearance: none; }