diff --git a/.eslintignore b/.eslintignore
index 467562a1d8b5..bdb10c6ae230 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -14,11 +14,7 @@ obj*/**
 # We ignore all these directories by default, until we get them enabled.
 # If you are enabling a directory, please add directory specific exclusions
 # below.
-docshell/resources/**
-docshell/test/browser/**
-docshell/test/chrome/**
-docshell/test/iframesandbox/**
-docshell/test/mochitest/**
+docshell/**
 extensions/cookie/**
 extensions/spellcheck/**
 extensions/universalchardet/**
diff --git a/docshell/test/navigation/.eslintrc.js b/docshell/test/navigation/.eslintrc.js
index ce627613ad3b..6746617eebd0 100644
--- a/docshell/test/navigation/.eslintrc.js
+++ b/docshell/test/navigation/.eslintrc.js
@@ -4,13 +4,5 @@ module.exports = {
   "extends": [
     "plugin:mozilla/browser-test",
     "plugin:mozilla/mochitest-test",
-  ],
-  
-  "plugins": [
-    "no-unsanitized",
-  ],
-
-  "rules": {
-    "no-unsanitized/method": "off",
-  },
+  ]
 };
diff --git a/docshell/test/navigation/NavigationUtils.js b/docshell/test/navigation/NavigationUtils.js
index 522ddf583780..219c5cbabf39 100644
--- a/docshell/test/navigation/NavigationUtils.js
+++ b/docshell/test/navigation/NavigationUtils.js
@@ -2,26 +2,26 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-// /////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
 //
 // Utilities for navigation tests
-//
-// /////////////////////////////////////////////////////////////////////////
+// 
+///////////////////////////////////////////////////////////////////////////
 
 var body = "This frame was navigated.";
-var target_url = "navigation_target_url.html";
+var target_url = "navigation_target_url.html"
 
 var popup_body = "This is a popup";
 var target_popup_url = "navigation_target_popup_url.html";
 
-// /////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
 // Functions that navigate frames
-// /////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
 
 function navigateByLocation(wnd) {
   try {
     wnd.location = target_url;
-  } catch (ex) {
+  } catch(ex) {
     // We need to keep our finished frames count consistent.
     // Oddly, this ends up simulating the behavior of IE7.
     window.open(target_url, "_blank", "width=10,height=10");
@@ -48,18 +48,18 @@ function navigateByHyperlink(name) {
   link.target = name;
   link.id = "navigation_hyperlink_" + hyperlink_count++;
   document.body.appendChild(link);
-  sendMouseEvent({type: "click"}, link.id);
+  sendMouseEvent({type:"click"}, link.id);
 }
 
-// /////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
 // Functions that call into Mochitest framework
-// /////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
 
 function isNavigated(wnd, message) {
   var result = null;
   try {
     result = SpecialPowers.wrap(wnd).document.body.innerHTML.trim();
-  } catch (ex) {
+  } catch(ex) {
     result = ex;
   }
   is(result, body, message);
@@ -69,7 +69,7 @@ function isBlank(wnd, message) {
   var result = null;
   try {
     result = wnd.document.body.innerHTML.trim();
-  } catch (ex) {
+  } catch(ex) {
     result = ex;
   }
   is(result, "This is a blank document.", message);
@@ -79,7 +79,7 @@ function isAccessible(wnd, message) {
   try {
     wnd.document.body.innerHTML;
     ok(true, message);
-  } catch (ex) {
+  } catch(ex) {
     ok(false, message);
   }
 }
@@ -88,19 +88,18 @@ function isInaccessible(wnd, message) {
   try {
     wnd.document.body.innerHTML;
     ok(false, message);
-  } catch (ex) {
+  } catch(ex) {
     ok(true, message);
   }
 }
 
-// /////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
 // Functions that require UniversalXPConnect privilege
-// /////////////////////////////////////////////////////////////////////////
-/* eslint-disable mozilla/use-services */
+///////////////////////////////////////////////////////////////////////////
+
 function xpcEnumerateContentWindows(callback) {
 
   var Ci = SpecialPowers.Ci;
-  // Replacing this with Services.ww format causes test errors, so ignore for now
   var ww = SpecialPowers.Cc["@mozilla.org/embedcomp/window-watcher;1"]
                         .getService(Ci.nsIWindowWatcher);
 
@@ -128,7 +127,6 @@ function xpcEnumerateContentWindows(callback) {
   while (contentWindows.length > 0)
     callback(contentWindows.pop());
 }
-/* eslint-enable mozilla/use-services */
 
 // Note: This only searches for top-level frames with this name.
 function xpcGetFramesByName(name) {
@@ -180,10 +178,10 @@ function xpcWaitForFinishedFrames(callback, numFrames) {
   function searchForFinishedFrames(win) {
     if ((win.location.href.endsWith(target_url) ||
          win.location.href.endsWith(target_popup_url)) &&
-        win.document &&
-        win.document.body &&
+        win.document && 
+        win.document.body && 
         (win.document.body.textContent.trim() == body ||
-         win.document.body.textContent.trim() == popup_body) &&
+         win.document.body.textContent.trim() == popup_body) && 
         win.document.readyState == "complete") {
 
       var windowId = win.windowUtils.outerWindowID;
@@ -201,7 +199,7 @@ function xpcWaitForFinishedFrames(callback, numFrames) {
       // This only gives us UniversalXPConnect for the current stack frame
       // We're using setInterval, so the main page's privileges are still normal
       xpcEnumerateContentWindows(searchForFinishedFrames);
-    } catch (ex) {
+    } catch(ex) {
       // We might be accessing windows before they are fully constructed,
       // which can throw.  We'll find those frames on our next poll().
     }
diff --git a/docshell/test/navigation/bluebox_bug430723.html b/docshell/test/navigation/bluebox_bug430723.html
index 5dcc53356282..0569ddcfa460 100644
--- a/docshell/test/navigation/bluebox_bug430723.html
+++ b/docshell/test/navigation/bluebox_bug430723.html
@@ -1,5 +1,5 @@
 <html><head>
-<script> window.addEventListener("pageshow", function() { opener.nextTest(); }); </script>
+<script> window.addEventListener("pageshow", function(){opener.nextTest();}, false); </script>
 </head><body>
 <div style="position:absolute; left:0px; top:0px; width:50%; height:150%; background-color:blue">
 <p>This is a very tall blue box.</p>
diff --git a/docshell/test/navigation/browser_bug343515.js b/docshell/test/navigation/browser_bug343515.js
index 5e44450505c9..7a145901c34f 100644
--- a/docshell/test/navigation/browser_bug343515.js
+++ b/docshell/test/navigation/browser_bug343515.js
@@ -95,7 +95,8 @@ function step3() {
     Assert.equal(content.frames.length, 2, "Tab 2 should have 2 iframes");
     for (var i = 0; i < content.frames.length; i++) {
       info("step 3, frame " + i + " info: " + content.frames[i].location);
-      let docShell = content.frames[i].docShell;
+      let docshell = content.frames[i].docShell;
+
       Assert.ok(!docShell.isActive, `Tab2 iframe ${i} should be inactive`);
     }
   }).then(() => {
@@ -109,7 +110,6 @@ function step3() {
 }
 
 function step4() {
-  /* eslint-disable no-shadow */
   function checkTab2Active(expected) {
     return ContentTask.spawn(ctx.tab2Browser, expected, async function(expected) {
       function isActive(aWindow) {
@@ -128,7 +128,7 @@ function step4() {
       Assert.equal(isActive(content.frames[1]), expected, `Tab2 iframe 1 should be ${active}`);
     });
   }
-  /* eslint-enable no-shadow */
+
   is(testPath + "bug343515_pg3.html", ctx.tab2Browser.currentURI.spec,
      "Got expected tab 2 url in step 4");
 
@@ -161,7 +161,8 @@ function step5() {
   ok(ctx.tab2Browser.docShellIsActive, "Tab 2 should be active");
   ContentTask.spawn(ctx.tab2Browser, null, async function() {
     for (var i = 0; i < content.frames.length; i++) {
-      let docShell = content.frames[i].docShell;
+      let docshell = content.frames[i].docShell;
+
       Assert.ok(docShell.isActive, `Tab2 iframe ${i} should be active`);
     }
   }).then(() => {
@@ -195,7 +196,8 @@ function step6() {
     ok(!ctx.tab2Browser.docShellIsActive, "Tab 2 should be inactive");
     return ContentTask.spawn(ctx.tab2Browser, null, async function() {
       for (var i = 0; i < content.frames.length; i++) {
-        let docShell = content.frames[i].docShell;
+        let docshell = content.frames[i].docShell;
+
         Assert.ok(!docShell.isActive, `Tab2 iframe ${i} should be inactive`);
       }
     });
@@ -207,7 +209,6 @@ function step6() {
 }
 
 function step7() {
-  /* eslint-disable no-shadow */
   function checkBrowser(browser, tabNum, active) {
     return ContentTask.spawn(browser, { tabNum, active },
                              async function({ tabNum, active }) {
@@ -225,7 +226,7 @@ function step7() {
                 `Tab${tabNum} iframe 1 should be ${activestr}`);
            });
   }
-  /* eslint-enable no-shadow */
+
   // Check everything
   ok(!ctx.tab0Browser.docShellIsActive, "Tab 0 should be inactive");
   ok(ctx.tab1Browser.docShellIsActive, "Tab 1 should be active");
@@ -238,7 +239,6 @@ function step7() {
   });
 }
 
-
 function allDone() {
 
   // Close the tabs we made
diff --git a/docshell/test/navigation/browser_test-content-chromeflags.js b/docshell/test/navigation/browser_test-content-chromeflags.js
index be8d748bc629..17c8e2473df2 100644
--- a/docshell/test/navigation/browser_test-content-chromeflags.js
+++ b/docshell/test/navigation/browser_test-content-chromeflags.js
@@ -13,13 +13,13 @@ add_task(async function() {
     SpecialPowers.pushPrefEnv({
       "set": [
         ["browser.link.open_newwindow", 2],
-      ],
+      ]
     }, resolve);
   });
 
   await BrowserTestUtils.withNewTab({
     gBrowser,
-    url: TEST_PAGE,
+    url: TEST_PAGE
   }, async function(browser) {
     let openedPromise = BrowserTestUtils.waitForNewWindow();
     BrowserTestUtils.synthesizeMouse("a", 0, 0, {}, browser);
diff --git a/docshell/test/navigation/file_bug1300461.html b/docshell/test/navigation/file_bug1300461.html
index eb77f74184e0..bb7e827d98e2 100644
--- a/docshell/test/navigation/file_bug1300461.html
+++ b/docshell/test/navigation/file_bug1300461.html
@@ -30,31 +30,31 @@
       let shistory = webNav.sessionHistory;
       let testSteps = [
         function() {
-          opener.is(shistory.count, 1, "check history length");
-          opener.is(shistory.index, 0, "check history index");
-          opener.ok(!webNav.canGoForward, "check canGoForward");
-          setTimeout(() => window.location = "file_bug1300461_back.html", 0);
+          opener.is(shistory.count, 1, 'check history length');
+          opener.is(shistory.index, 0, 'check history index');
+          opener.ok(!webNav.canGoForward, 'check canGoForward');
+          setTimeout(() => window.location = 'file_bug1300461_back.html', 0);
         },
         function() {
-          opener.is(shistory.count, 2, "check history length");
-          opener.is(shistory.index, 0, "check history index");
-          opener.ok(webNav.canGoForward, "check canGoForward");
+          opener.is(shistory.count, 2, 'check history length');
+          opener.is(shistory.index, 0, 'check history index');
+          opener.ok(webNav.canGoForward, 'check canGoForward');
           window.history.forward();
-          opener.is(shistory.legacySHistory.requestedIndex, 1, "check requestedIndex");
+          opener.is(shistory.legacySHistory.requestedIndex, 1, 'check requestedIndex');
         },
         function() {
-          opener.is(shistory.count, 2, "check history length");
-          opener.is(shistory.index, 0, "check history index");
-          opener.ok(webNav.canGoForward, "check canGoForward");
-          opener.info("file_bug1300461.html tests finished");
+          opener.is(shistory.count, 2, 'check history length');
+          opener.is(shistory.index, 0, 'check history index');
+          opener.ok(webNav.canGoForward, 'check canGoForward');
+          opener.info('file_bug1300461.html tests finished');
           opener.nextTest();
           window.close();
-        },
+        }
       ];
 
       function test() {
         if (opener) {
-          opener.info("file_bug1300461.html test " + opener.testCount);
+          opener.info('file_bug1300461.html test ' + opener.testCount);
           testSteps[opener.testCount++]();
         }
       }
diff --git a/docshell/test/navigation/file_bug1300461_back.html b/docshell/test/navigation/file_bug1300461_back.html
index 5803d174c7c9..7f2488e27a81 100644
--- a/docshell/test/navigation/file_bug1300461_back.html
+++ b/docshell/test/navigation/file_bug1300461_back.html
@@ -15,13 +15,13 @@
       function test() {
         if (opener) {
           opener.info("file_bug1300461_back.html");
-          opener.is(shistory.count, 2, "check history length");
-          opener.is(shistory.index, 1, "check history index");
-          opener.is(shistory.legacySHistory.requestedIndex, -1, "check requestedIndex");
-          opener.ok(webNav.canGoBack, "check canGoBack");
+          opener.is(shistory.count, 2, 'check history length');
+          opener.is(shistory.index, 1, 'check history index');
+          opener.is(shistory.legacySHistory.requestedIndex, -1, 'check requestedIndex');
+          opener.ok(webNav.canGoBack, 'check canGoBack');
           if (opener.testCount == 1) {
-            opener.info("replaceState to redirect.html");
-            window.history.replaceState({}, "", "file_bug1300461_redirect.html");
+            opener.info('replaceState to redirect.html');
+            window.history.replaceState({}, '', 'file_bug1300461_redirect.html');
           }
           window.history.back();
         }
diff --git a/docshell/test/navigation/file_bug1326251.html b/docshell/test/navigation/file_bug1326251.html
index ebdee540add7..168100329388 100644
--- a/docshell/test/navigation/file_bug1326251.html
+++ b/docshell/test/navigation/file_bug1326251.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>Bug 1326251</title>
     <script>
-    const BASE_URL = "http://mochi.test:8888/tests/docshell/test/navigation/";
+    const BASE_URL = 'http://mochi.test:8888/tests/docshell/test/navigation/';
     let testSteps = [
       async function() {
         // Test 1: Create dynamic iframe with bfcache enabled.
@@ -12,36 +12,36 @@
         // and navigate back. Both iframes should still exist with history
         // entries preserved.
         window.onunload = null; // enable bfcache
-        await createDynamicFrame(document);
-        await loadUriInFrame(document.getElementById("staticFrame"), "frame1.html");
-        await loadUriInFrame(document.getElementById("dynamicFrame"), "frame1.html");
-        await loadUriInFrame(document.getElementById("staticFrame"), "frame2.html");
-        await loadUriInFrame(document.getElementById("dynamicFrame"), "frame2.html");
-        opener.is(history.length, 5, "history.length");
-        window.location = "goback.html";
+        let dynamicFrame = await createDynamicFrame(document);
+        await loadUriInFrame(document.getElementById('staticFrame'), 'frame1.html');
+        await loadUriInFrame(document.getElementById('dynamicFrame'), 'frame1.html');
+        await loadUriInFrame(document.getElementById('staticFrame'), 'frame2.html');
+        await loadUriInFrame(document.getElementById('dynamicFrame'), 'frame2.html');
+        opener.is(history.length, 5, 'history.length');
+        window.location = 'goback.html';
       },
       async function() {
         let webNav = SpecialPowers.wrap(window)
                        .docShell
                        .QueryInterface(SpecialPowers.Ci.nsIWebNavigation);
         let shistory = webNav.sessionHistory;
-        opener.is(webNav.canGoForward, true, "canGoForward");
-        opener.is(shistory.index, 4, "shistory.index");
-        opener.is(history.length, 6, "history.length");
-        opener.is(document.getElementById("staticFrame").contentWindow.location.href, BASE_URL + "frame2.html", "staticFrame location");
-        opener.is(document.getElementById("dynamicFrame").contentWindow.location.href, BASE_URL + "frame2.html", "dynamicFrame location");
+        opener.is(webNav.canGoForward, true, 'canGoForward');
+        opener.is(shistory.index, 4, 'shistory.index');
+        opener.is(history.length, 6, 'history.length');
+        opener.is(document.getElementById('staticFrame').contentWindow.location.href, BASE_URL + 'frame2.html', 'staticFrame location');
+        opener.is(document.getElementById('dynamicFrame').contentWindow.location.href, BASE_URL + 'frame2.html', 'dynamicFrame location');
 
         // Test 2: Load another page in dynamic iframe, canGoForward should be
         // false.
-        await loadUriInFrame(document.getElementById("dynamicFrame"), "frame3.html");
-        opener.is(webNav.canGoForward, false, "canGoForward");
-        opener.is(shistory.index, 5, "shistory.index");
-        opener.is(history.length, 6, "history.length");
+        await loadUriInFrame(document.getElementById('dynamicFrame'), 'frame3.html');
+        opener.is(webNav.canGoForward, false, 'canGoForward');
+        opener.is(shistory.index, 5, 'shistory.index');
+        opener.is(history.length, 6, 'history.length');
 
         // Test 3: Navigate to antoher page with bfcache disabled, all dynamic
         // iframe entries should be removed.
-        window.onunload = function() {}; // disable bfcache
-        window.location = "goback.html";
+        window.onunload = function(){}; // disable bfcache
+        window.location = 'goback.html';
       },
       async function() {
         let windowWrap = SpecialPowers.wrap(window);
@@ -49,58 +49,58 @@
         let shistory = docShell.QueryInterface(SpecialPowers.Ci.nsIWebNavigation)
                                .sessionHistory;
         // Now staticFrame has frame0 -> frame1 -> frame2.
-        opener.is(docShell.previousEntryIndex, 3, "docShell.previousEntryIndex");
-        opener.is(docShell.loadedEntryIndex, 2, "docShell.loadedEntryIndex");
-        opener.is(shistory.index, 2, "shistory.index");
-        opener.is(history.length, 4, "history.length");
-        opener.is(document.getElementById("staticFrame").contentWindow.location.href, BASE_URL + "frame2.html", "staticFrame location");
-        opener.ok(!document.getElementById("dynamicFrame"), "dynamicFrame should not exist");
+        opener.is(docShell.previousEntryIndex, 3, 'docShell.previousEntryIndex');
+        opener.is(docShell.loadedEntryIndex, 2, 'docShell.loadedEntryIndex');
+        opener.is(shistory.index, 2, 'shistory.index');
+        opener.is(history.length, 4, 'history.length');
+        opener.is(document.getElementById('staticFrame').contentWindow.location.href, BASE_URL + 'frame2.html', 'staticFrame location');
+        opener.ok(!document.getElementById('dynamicFrame'), 'dynamicFrame should not exist');
 
         // Test 4: Load a nested frame in the static frame, navigate the inner
         // static frame, add a inner dynamic frame and navigate the dynamic
         // frame. Then navigate the outer static frame and go back. The inner
         // iframe should show the last entry of inner static frame.
-        let staticFrame = document.getElementById("staticFrame");
-        staticFrame.width = "320px";
-        staticFrame.height = "360px";
-        await loadUriInFrame(staticFrame, "iframe_static.html");
-        let innerStaticFrame = staticFrame.contentDocument.getElementById("staticFrame");
-        await loadUriInFrame(innerStaticFrame, "frame1.html");
-        let innerDynamicFrame = await createDynamicFrame(staticFrame.contentDocument, "frame2.html");
-        await loadUriInFrame(innerDynamicFrame, "frame3.html");
+        let staticFrame = document.getElementById('staticFrame');
+        staticFrame.width = '320px';
+        staticFrame.height = '360px';
+        await loadUriInFrame(staticFrame, 'iframe_static.html');
+        let innerStaticFrame = staticFrame.contentDocument.getElementById('staticFrame');
+        await loadUriInFrame(innerStaticFrame, 'frame1.html');
+        let innerDynamicFrame = await createDynamicFrame(staticFrame.contentDocument, 'frame2.html');
+        await loadUriInFrame(innerDynamicFrame, 'frame3.html');
         // staticFrame:       frame0 -> frame1 -> frame2 -> iframe_static
         // innerStaticFrame:                                frame0        -> frame1
         // innerDynamicFrame:                                                frame2 -> frame3
-        opener.is(shistory.index, 5, "shistory.index");
-        opener.is(history.length, 6, "history.length");
+        opener.is(shistory.index, 5, 'shistory.index');
+        opener.is(history.length, 6, 'history.length');
 
         // Wait for 2 load events - navigation and goback.
         let onloadPromise = awaitOnload(staticFrame, 2);
-        await loadUriInFrame(staticFrame, "goback.html");
+        await loadUriInFrame(staticFrame, 'goback.html');
         await onloadPromise;
         // staticFrame:       frame0 -> frame1 -> frame2 -> iframe_static           -> goback
         // innerStaticFrame:                                frame0        -> frame1
-        opener.is(shistory.index, 4, "shistory.index");
-        opener.is(history.length, 6, "history.length");
-        innerStaticFrame = staticFrame.contentDocument.getElementById("staticFrame");
-        opener.is(innerStaticFrame.contentDocument.location.href, BASE_URL + "frame1.html", "innerStaticFrame location");
-        opener.ok(!staticFrame.contentDocument.getElementById("dynamicFrame"), "innerDynamicFrame should not exist");
+        opener.is(shistory.index, 4, 'shistory.index');
+        opener.is(history.length, 6, 'history.length');
+        innerStaticFrame = staticFrame.contentDocument.getElementById('staticFrame');
+        opener.is(innerStaticFrame.contentDocument.location.href, BASE_URL + 'frame1.html', 'innerStaticFrame location');
+        opener.ok(!staticFrame.contentDocument.getElementById('dynamicFrame'), 'innerDynamicFrame should not exist');
 
         // Test 5: Insert and navigate inner dynamic frame again with bfcache
         // enabled, and navigate top level window to a special page which will
         // evict bfcache then goback. Verify that dynamic entries are correctly
         // removed in this case.
         window.onunload = null; // enable bfcache
-        staticFrame.width = "320px";
-        staticFrame.height = "360px";
-        innerDynamicFrame = await createDynamicFrame(staticFrame.contentDocument, "frame2.html");
-        await loadUriInFrame(innerDynamicFrame, "frame3.html");
+        staticFrame.width = '320px';
+        staticFrame.height = '360px';
+        innerDynamicFrame = await createDynamicFrame(staticFrame.contentDocument, 'frame2.html');
+        await loadUriInFrame(innerDynamicFrame, 'frame3.html');
         // staticFrame:       frame0 -> frame1 -> frame2 -> iframe_static
         // innerStaticFrame:                                frame0        -> frame1
         // innerDynamicFrame:                                                frame2 -> frame3
-        opener.is(shistory.index, 5, "shistory.index");
-        opener.is(history.length, 6, "history.length");
-        window.location = "file_bug1326251_evict_cache.html";
+        opener.is(shistory.index, 5, 'shistory.index');
+        opener.is(history.length, 6, 'history.length');
+        window.location = 'file_bug1326251_evict_cache.html';
       },
       async function() {
         let windowWrap = SpecialPowers.wrap(window);
@@ -109,26 +109,26 @@
                                .sessionHistory;
         // staticFrame:       frame0 -> frame1 -> frame2 -> iframe_static
         // innerStaticFrame:                                frame0        -> frame1
-        opener.is(docShell.previousEntryIndex, 5, "docShell.previousEntryIndex");
-        opener.is(docShell.loadedEntryIndex, 4, "docShell.loadedEntryIndex");
-        opener.is(shistory.index, 4, "shistory.index");
-        opener.is(history.length, 6, "history.length");
-        let staticFrame = document.getElementById("staticFrame");
-        let innerStaticFrame = staticFrame.contentDocument.getElementById("staticFrame");
-        opener.is(innerStaticFrame.contentDocument.location.href, BASE_URL + "frame1.html", "innerStaticFrame location");
-        opener.ok(!staticFrame.contentDocument.getElementById("dynamicFrame"), "innerDynamicFrame should not exist");
+        opener.is(docShell.previousEntryIndex, 5, 'docShell.previousEntryIndex');
+        opener.is(docShell.loadedEntryIndex, 4, 'docShell.loadedEntryIndex');
+        opener.is(shistory.index, 4, 'shistory.index');
+        opener.is(history.length, 6, 'history.length');
+        let staticFrame = document.getElementById('staticFrame');
+        let innerStaticFrame = staticFrame.contentDocument.getElementById('staticFrame');
+        opener.is(innerStaticFrame.contentDocument.location.href, BASE_URL + 'frame1.html', 'innerStaticFrame location');
+        opener.ok(!staticFrame.contentDocument.getElementById('dynamicFrame'), 'innerDynamicFrame should not exist');
 
         // Test 6: Insert and navigate inner dynamic frame and then reload outer
         // frame. Verify that inner dynamic frame entries are all removed.
-        staticFrame.width = "320px";
-        staticFrame.height = "360px";
-        let innerDynamicFrame = await createDynamicFrame(staticFrame.contentDocument, "frame2.html");
-        await loadUriInFrame(innerDynamicFrame, "frame3.html");
+        staticFrame.width = '320px';
+        staticFrame.height = '360px';
+        let innerDynamicFrame = await createDynamicFrame(staticFrame.contentDocument, 'frame2.html');
+        await loadUriInFrame(innerDynamicFrame, 'frame3.html');
         // staticFrame:       frame0 -> frame1 -> frame2 -> iframe_static
         // innerStaticFrame:                                frame0        -> frame1
         // innerDynamicFrame:                                                frame2 -> frame3
-        opener.is(shistory.index, 5, "shistory.index");
-        opener.is(history.length, 6, "history.length");
+        opener.is(shistory.index, 5, 'shistory.index');
+        opener.is(history.length, 6, 'history.length');
         let staticFrameLoadPromise = new Promise(resolve => {
           staticFrame.onload = resolve;
         });
@@ -136,34 +136,34 @@
         await staticFrameLoadPromise;
         // staticFrame:       frame0 -> frame1 -> frame2 -> iframe_static
         // innerStaticFrame:                                frame0        -> frame1
-        opener.is(shistory.index, 4, "shistory.index");
-        opener.is(history.length, 5, "history.length");
-        innerStaticFrame = staticFrame.contentDocument.getElementById("staticFrame");
-        opener.is(innerStaticFrame.contentDocument.location.href, BASE_URL + "frame1.html", "innerStaticFrame location");
-        opener.ok(!staticFrame.contentDocument.getElementById("dynamicFrame"), "innerDynamicFrame should not exist");
+        opener.is(shistory.index, 4, 'shistory.index');
+        opener.is(history.length, 5, 'history.length');
+        innerStaticFrame = staticFrame.contentDocument.getElementById('staticFrame');
+        opener.is(innerStaticFrame.contentDocument.location.href, BASE_URL + 'frame1.html', 'innerStaticFrame location');
+        opener.ok(!staticFrame.contentDocument.getElementById('dynamicFrame'), 'innerDynamicFrame should not exist');
         opener.nextTest();
         window.close();
-      },
+      }
     ];
 
-    function awaitOnload(frame, occurances = 1) {
+    function awaitOnload(frame, occurances=1) {
       return new Promise(function(resolve, reject) {
         let count = 0;
-        frame.addEventListener("load", function listener(e) {
+        frame.addEventListener('load', function listener(e) {
           if (++count == occurances) {
-            frame.removeEventListener("load", listener);
+            frame.removeEventListener('load', listener);
             setTimeout(resolve, 0);
           }
         });
       });
     }
 
-    async function createDynamicFrame(targetDocument, frameSrc = "frame0.html") {
-      let dynamicFrame = targetDocument.createElement("iframe");
+    async function createDynamicFrame(targetDocument, frameSrc='frame0.html') {
+      let dynamicFrame = targetDocument.createElement('iframe');
       let onloadPromise = awaitOnload(dynamicFrame);
-      dynamicFrame.id = "dynamicFrame";
+      dynamicFrame.id = 'dynamicFrame';
       dynamicFrame.src = frameSrc;
-      let container = targetDocument.getElementById("frameContainer");
+      let container = targetDocument.getElementById('frameContainer');
       container.appendChild(dynamicFrame);
       await onloadPromise;
       return dynamicFrame;
diff --git a/docshell/test/navigation/file_bug1375833.html b/docshell/test/navigation/file_bug1375833.html
index 373a7fe08eb6..d7e239fdfaec 100644
--- a/docshell/test/navigation/file_bug1375833.html
+++ b/docshell/test/navigation/file_bug1375833.html
@@ -15,7 +15,7 @@
         iframe.onload = function() {
           opener.postMessage(iframe.contentWindow.location.href, "*");
         };
-      };
+      }
     }
     </script>
   </body>
diff --git a/docshell/test/navigation/file_bug1379762-1.html b/docshell/test/navigation/file_bug1379762-1.html
index ce205ad8c5f1..e8cd8b30b49f 100644
--- a/docshell/test/navigation/file_bug1379762-1.html
+++ b/docshell/test/navigation/file_bug1379762-1.html
@@ -14,7 +14,6 @@
       ++opener.testCount;
       if (opener.testCount == 1) {
         // Navigate forward and then back.
-        // eslint-disable-next-line no-global-assign
         setTimeout(function() { location = "goback.html"; }, 0);
       } else if (opener.testCount == 2) {
         // Do this async so our load event gets a chance to fire if it plans to
@@ -28,6 +27,6 @@
     onload = function() {
       ++loadCount;
       opener.is(loadCount, 1, "Should only get one onload");
-    };
+    }
   </script>
 </html>
diff --git a/docshell/test/navigation/file_bug1379762-2.html b/docshell/test/navigation/file_bug1379762-2.html
index e75327c869bb..86033cb2e86c 100644
--- a/docshell/test/navigation/file_bug1379762-2.html
+++ b/docshell/test/navigation/file_bug1379762-2.html
@@ -37,7 +37,6 @@
     var data = document.querySelector("script[type='text/just-data']").textContent;
     // Store the string that does all out work in a global variable, so we can
     // get at it later.
-    // eslint-disable-next-line no-useless-concat
     var testScript = "<script>" + data + "</" + "script>";
     document.write(testScript);
   </script>
diff --git a/docshell/test/navigation/file_bug386782_contenteditable.html b/docshell/test/navigation/file_bug386782_contenteditable.html
index 4515d015d9c1..b4a2329df286 100644
--- a/docshell/test/navigation/file_bug386782_contenteditable.html
+++ b/docshell/test/navigation/file_bug386782_contenteditable.html
@@ -1 +1 @@
-<html><head><meta charset="utf-8"><script>window.addEventListener("pageshow", function(event) { window.opener.postMessage({persisted: event.persisted}, "*"); });</script></head><body contentEditable="true"><p>contentEditable</p></body></html>
\ No newline at end of file
+<html><head><meta charset="utf-8"><script>window.addEventListener("pageshow", function(event) { window.opener.postMessage({persisted:event.persisted}, "*"); });</script></head><body contentEditable="true"><p>contentEditable</p></body></html>
\ No newline at end of file
diff --git a/docshell/test/navigation/file_bug386782_designmode.html b/docshell/test/navigation/file_bug386782_designmode.html
index faa063cbaec9..592b5259232c 100644
--- a/docshell/test/navigation/file_bug386782_designmode.html
+++ b/docshell/test/navigation/file_bug386782_designmode.html
@@ -1 +1 @@
-<html><head><meta charset="utf-8"><script>window.addEventListener("pageshow", function(event) { window.opener.postMessage({persisted: event.persisted}, "*"); });</script></head><body><p>designModeDocument</p></body></html>
\ No newline at end of file
+<html><head><meta charset="utf-8"><script>window.addEventListener("pageshow", function(event) { window.opener.postMessage({persisted:event.persisted}, "*"); });</script></head><body><p>designModeDocument</p></body></html>
\ No newline at end of file
diff --git a/docshell/test/navigation/file_bug462076_1.html b/docshell/test/navigation/file_bug462076_1.html
index 5050e79fdc17..0aafa9bda1a8 100644
--- a/docshell/test/navigation/file_bug462076_1.html
+++ b/docshell/test/navigation/file_bug462076_1.html
@@ -21,15 +21,15 @@
         for (var i = randomNumber; i < 4; ++i) {
           makeFrame(i);
         }
-        for (var k = 0; k < randomNumber; ++k) {
-          makeFrame(k);
+        for (var i = 0; i < randomNumber; ++i) {
+          makeFrame(i);
         }
       }
 
       function checkFrame(evt) {
         var ifr = evt.target;
-        opener.ok(String(ifr.contentWindow.location).includes(ifr.src),
-           "Wrong document loaded (" + ifr.src + ", " +
+        opener.ok(new String(ifr.contentWindow.location).includes(ifr.src),
+           "Wrong document loaded (" + ifr.src + ", " + 
            ifr.contentWindow.location + ")!");
 
         if (++checkCount == 4) {
diff --git a/docshell/test/navigation/file_bug462076_2.html b/docshell/test/navigation/file_bug462076_2.html
index 63cf3de3f957..936099e5773a 100644
--- a/docshell/test/navigation/file_bug462076_2.html
+++ b/docshell/test/navigation/file_bug462076_2.html
@@ -21,15 +21,15 @@
         for (var i = randomNumber; i < 4; ++i) {
           makeFrame(i);
         }
-        for (var k = 0; k < randomNumber; ++k) {
-          makeFrame(k);
+        for (var i = 0; i < randomNumber; ++i) {
+          makeFrame(i);
         }
       }
 
       function checkFrame(evt) {
         var ifr = evt.target;
-        opener.ok(String(ifr.contentWindow.location).includes(ifr.src),
-           "Wrong document loaded (" + ifr.src + ", " +
+        opener.ok(new String(ifr.contentWindow.location).includes(ifr.src),
+           "Wrong document loaded (" + ifr.src + ", " + 
            ifr.contentWindow.location + ")!");
 
         if (++checkCount == 4) {
diff --git a/docshell/test/navigation/file_bug462076_3.html b/docshell/test/navigation/file_bug462076_3.html
index 5c779d2f4988..05713df44af9 100644
--- a/docshell/test/navigation/file_bug462076_3.html
+++ b/docshell/test/navigation/file_bug462076_3.html
@@ -21,15 +21,15 @@
         for (var i = randomNumber; i < 4; ++i) {
           makeFrame(i);
         }
-        for (var k = 0; k < randomNumber; ++k) {
-          makeFrame(k);
+        for (var i = 0; i < randomNumber; ++i) {
+          makeFrame(i);
         }
       }
 
       function checkFrame(evt) {
         var ifr = evt.target;
-        opener.ok(String(ifr.contentWindow.location).includes(ifr.src),
-           "Wrong document loaded (" + ifr.src + ", " +
+        opener.ok(new String(ifr.contentWindow.location).includes(ifr.src),
+           "Wrong document loaded (" + ifr.src + ", " + 
            ifr.contentWindow.location + ")!");
 
         if (++checkCount == 4) {
diff --git a/docshell/test/navigation/file_bug508537_1.html b/docshell/test/navigation/file_bug508537_1.html
index 3b1f6a175c3e..0531cbea7de5 100644
--- a/docshell/test/navigation/file_bug508537_1.html
+++ b/docshell/test/navigation/file_bug508537_1.html
@@ -3,9 +3,9 @@
     <script>
       function dynFrameLoad() {
         var ifrs = document.getElementsByTagName("iframe");
-        opener.ok(String(ifrs[0].contentWindow.location).includes(ifrs[0].src),
+        opener.ok(new String(ifrs[0].contentWindow.location).includes(ifrs[0].src),
                   "Wrong document loaded (1)\n");
-        opener.ok(String(ifrs[1].contentWindow.location).includes(ifrs[1].src),
+        opener.ok(new String(ifrs[1].contentWindow.location).includes(ifrs[1].src),
                   "Wrong document loaded (2)\n");
         if (opener && ++opener.testCount == 1) {
           window.location = "goback.html";
@@ -16,7 +16,7 @@
       }
 
       window.addEventListener("load",
-        function() {
+        function () {
           var container = document.getElementById("t1");
           container.addEventListener("load", dynFrameLoad, true);
           container.appendChild(container.appendChild(document.getElementById("i1")));
diff --git a/docshell/test/navigation/file_bug534178.html b/docshell/test/navigation/file_bug534178.html
index 5cf4764e8077..56647e17071e 100644
--- a/docshell/test/navigation/file_bug534178.html
+++ b/docshell/test/navigation/file_bug534178.html
@@ -7,7 +7,7 @@
         var isOK = false;
         try {
           isOK = history.previous != location;
-        } catch (ex) {
+        } catch(ex) {
           // history.previous should throw if this is the first page in shistory.
           isOK = true;
         }
diff --git a/docshell/test/navigation/file_scrollRestoration.html b/docshell/test/navigation/file_scrollRestoration.html
index 56fbfeac6e5d..9a938003c746 100644
--- a/docshell/test/navigation/file_scrollRestoration.html
+++ b/docshell/test/navigation/file_scrollRestoration.html
@@ -29,7 +29,7 @@
             opener.isnot(Math.round(window.scrollY), 0, "Should have restored scrolling.");
             opener.is(history.scrollRestoration, "auto", "Should have the same scrollRestoration as before reload.");
             history.scrollRestoration = "manual";
-            window.onunload = function() {}; // Disable bfcache.
+            window.onunload = function() {} // Disable bfcache.
             window.location.reload(false);
             break;
           }
@@ -40,7 +40,7 @@
             document.getElementById("bottom").scrollIntoView();
             window.onunload = null; // Should get bfcache behavior.
             opener.setTimeout("SpecialPowers.wrap(testWindow).history.back();", 250);
-            window.location.href = "about:blank";
+            window.location.href = 'about:blank';
             break;
           }
           case 4: {
@@ -55,9 +55,9 @@
           case 5: {
             opener.isnot(Math.round(window.scrollY), 0, "Should have scrolled to #hash.");
             opener.is(history.scrollRestoration, "manual", "Should have the same scrollRestoration mode as before fragment navigation.");
-            window.onunload = function() {}; // Disable bfcache.
+            window.onunload = function() {} // Disable bfcache.
             opener.setTimeout("is(SpecialPowers.wrap(testWindow).history.scrollRestoration, 'auto'); SpecialPowers.wrap(testWindow).history.back();", 250);
-            window.location.href = "about:blank";
+            window.location.href = 'about:blank';
             break;
           }
           case 6: {
@@ -104,15 +104,15 @@
           }
           case 8: {
             try {
-              oldHistoryObject.scrollRestoration;
+              var sr = oldHistoryObject.scrollRestoration;
               opener.ok(false, "Should have thrown an exception.");
-            } catch (ex) {
+            } catch(ex) {
               opener.isnot(ex, null, "Did get an exception");
             }
             try {
               oldHistoryObject.scrollRestoration = "auto";
               opener.ok(false, "Should have thrown an exception.");
-            } catch (ex) {
+            } catch(ex) {
               opener.isnot(ex, null, "Did get an exception");
             }
             opener.nextTest();
diff --git a/docshell/test/navigation/file_shiftReload_and_pushState.html b/docshell/test/navigation/file_shiftReload_and_pushState.html
index 4e2bd03dbeb4..5a777894b672 100644
--- a/docshell/test/navigation/file_shiftReload_and_pushState.html
+++ b/docshell/test/navigation/file_shiftReload_and_pushState.html
@@ -4,7 +4,7 @@
       function test() {
         try {
           frames[0].history.pushState({}, "state", "?pushed");
-        } catch (ex) {
+        } catch(ex) {
           opener.ok(false, "history.pushState shouldn't throw");
         }
 
diff --git a/docshell/test/navigation/file_static_and_dynamic_1.html b/docshell/test/navigation/file_static_and_dynamic_1.html
index fd1bb82f3678..208f844cecb7 100644
--- a/docshell/test/navigation/file_static_and_dynamic_1.html
+++ b/docshell/test/navigation/file_static_and_dynamic_1.html
@@ -15,7 +15,7 @@
         test();
       } else {
         var staticFrame = document.getElementById("staticframe");
-        opener.ok(String(staticFrame.contentWindow.location).includes(staticFrame.src),
+        opener.ok(new String(staticFrame.contentWindow.location).includes(staticFrame.src),
                   "Wrong document loaded!");
         opener.nextTest();
         window.close();
diff --git a/docshell/test/navigation/file_triggeringprincipal_frame_1.html b/docshell/test/navigation/file_triggeringprincipal_frame_1.html
index 528437f892a9..855d4b9df1d0 100644
--- a/docshell/test/navigation/file_triggeringprincipal_frame_1.html
+++ b/docshell/test/navigation/file_triggeringprincipal_frame_1.html
@@ -8,18 +8,18 @@
 <script type="application/javascript">
   // make sure to set document.domain to the same domain as the subframe
   window.onload = function() {
-    document.domain = "mochi.test";
+    document.domain = 'mochi.test';
   };
-  window.addEventListener("message", receiveMessage);
+  window.addEventListener('message', receiveMessage);
   function receiveMessage(event) {
     // make sure to get the right start command, otherwise
     // let the parent know and fail the test
-    if (event.data.start !== "startTest") {
+    if (event.data.start !== 'startTest') {
       window.removeEventListener("message", receiveMessage);
-      window.parent.postMessage({triggeringPrincipalURI: "false"}, "*");
+      window.parent.postMessage({triggeringPrincipalURI: 'false'}, '*');
     }
     // click the link to navigate the subframe
-    document.getElementById("testlink").click();
+    document.getElementById('testlink').click();
   }
 </script>
 
diff --git a/docshell/test/navigation/file_triggeringprincipal_subframe.html b/docshell/test/navigation/file_triggeringprincipal_subframe.html
index ba6b6dc09a1c..0db1349f2f95 100644
--- a/docshell/test/navigation/file_triggeringprincipal_subframe.html
+++ b/docshell/test/navigation/file_triggeringprincipal_subframe.html
@@ -6,9 +6,9 @@
 <script type='application/javascript'>
   // make sure to set document.domain to same domain as frame 1
   window.onload = function() {
-    document.domain = "mochi.test";
+    document.domain = 'mochi.test';
     //   let Frame 1 know that we are ready to run the test
-    window.parent.parent.frames[0].postMessage({start: "startTest"}, "*");
+    window.parent.parent.frames[0].postMessage({start: 'startTest'}, '*');
   };
 </script>
 </body>
diff --git a/docshell/test/navigation/file_triggeringprincipal_subframe_nav.html b/docshell/test/navigation/file_triggeringprincipal_subframe_nav.html
index c3673ad299d5..e5abc1ea1951 100644
--- a/docshell/test/navigation/file_triggeringprincipal_subframe_nav.html
+++ b/docshell/test/navigation/file_triggeringprincipal_subframe_nav.html
@@ -6,15 +6,15 @@
 
 <script type='application/javascript'>
   function checkResults() {
-    // query the uri of the loadingPrincipal and the TriggeringPrincipal and pass
-    // that information on to the parent for verification.
+  	// query the uri of the loadingPrincipal and the TriggeringPrincipal and pass
+  	// that information on to the parent for verification.
     var channel = SpecialPowers.wrap(window).docShell.currentDocumentChannel;
     var triggeringPrincipalURI = channel.loadInfo.triggeringPrincipal.URI.asciiSpec;
     var loadingPrincipalURI = channel.loadInfo.loadingPrincipal.URI.asciiSpec;
     var referrerURI = document.referrer;
     window.parent.parent.postMessage({triggeringPrincipalURI,
-                                    loadingPrincipalURI,
-                                    referrerURI}, "*");
+    	                              loadingPrincipalURI,
+    	                              referrerURI}, '*');
   }
 </script>
 </body>
diff --git a/docshell/test/navigation/navigate.html b/docshell/test/navigation/navigate.html
index cc142b07cbdb..e686da4236c0 100644
--- a/docshell/test/navigation/navigate.html
+++ b/docshell/test/navigation/navigate.html
@@ -4,13 +4,12 @@
     <script src="NavigationUtils.js"></script>
     <script>
     function navigate() {
-        var args = window.location.hash.substring(1).split(",");
-        var target = args[0];
-        var mechanism = args[1];
+        var arguments = window.location.hash.substring(1).split(",");
+        var target = arguments[0];
+        var mechanism = arguments[1];
 
-        switch (mechanism) {
+        switch(mechanism) {
         case "location":
-          // eslint-disable-next-line no-eval
           navigateByLocation(eval(target));
           break;
         case "open":
@@ -28,9 +27,9 @@
 </head>
 <body onload="navigate();">
 <script>
-var args = window.location.hash.substring(1).split(",");
-var target = args[0];
-var mechanism = args[1];
+var arguments = window.location.hash.substring(1).split(",");
+var target = arguments[0];
+var mechanism = arguments[1];
 document.write("target=" + target + " mechanism=" + mechanism);
 </script>
 </body>
diff --git a/docshell/test/navigation/redbox_bug430723.html b/docshell/test/navigation/redbox_bug430723.html
index c2d1f980923e..db025c31f7ca 100644
--- a/docshell/test/navigation/redbox_bug430723.html
+++ b/docshell/test/navigation/redbox_bug430723.html
@@ -1,5 +1,5 @@
 <html><head>
-<script> window.addEventListener("pageshow", function() { opener.nextTest(); }); </script> 
+<script> window.addEventListener("pageshow", function(){opener.nextTest();}, false); </script> 
 </head><body>
 <div style="position:absolute; left:0px; top:0px; width:50%; height:150%; background-color:red">
 <p>This is a very tall red box.</p>
diff --git a/docshell/test/navigation/test_bug270414.html b/docshell/test/navigation/test_bug270414.html
index ffa135fe70bb..98dcf42f8df1 100644
--- a/docshell/test/navigation/test_bug270414.html
+++ b/docshell/test/navigation/test_bug270414.html
@@ -9,18 +9,12 @@
       iframe { width: 90%; height: 50px; }
     </style>
 <script>
-/* eslint-disable no-useless-concat */
 var headerHTML = "<html><head>" +
-                 "<script src='/tests/SimpleTest/EventUtils.js'></scr" + "ipt>" +
+                 "<script src='/tests/SimpleTest/EventUtils.js'></scr" + "ipt>" + 
                  "<script src='NavigationUtils.js'></scr" + "ipt>" +
                  "</head><body>";
 var footerHTML = "</body></html>";
 
-let window0 = null;
-let window1 = null;
-let window2 = null;
-let window3 = null;
-
 function testChild0() {
   if (!window.window0) {
     window0 = window.open("", "window0", "width=10,height=10");
diff --git a/docshell/test/navigation/test_bug278916.html b/docshell/test/navigation/test_bug278916.html
index fc8a942c77dd..3ad6a9666c87 100644
--- a/docshell/test/navigation/test_bug278916.html
+++ b/docshell/test/navigation/test_bug278916.html
@@ -6,21 +6,21 @@
     <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
     <script type="text/javascript" src="NavigationUtils.js"></script>
 <script>
-window.onload = function() {
+window.onload = function () {
   document.getElementById("link0").href = target_url;
-  sendMouseEvent({type: "click"}, "link0");
-
+  sendMouseEvent({type:"click"}, "link0");
+  
   xpcWaitForFinishedFrames(function() {
     var array_of_frames = xpcGetFramesByName("window0");
     is(array_of_frames.length, 1, "Should only open one window using a fancy hyperlink.");
 
-    for (var i = 0; i < array_of_frames.length; ++i)
+    for (var i=0; i < array_of_frames.length; ++i)
       array_of_frames[i].close();
 
     xpcCleanupWindows();
     SimpleTest.finish();
   }, 1);
-};
+}
 </script>
 </head>
 <body>
diff --git a/docshell/test/navigation/test_bug279495.html b/docshell/test/navigation/test_bug279495.html
index 0cbc9dec75ef..79a169567774 100644
--- a/docshell/test/navigation/test_bug279495.html
+++ b/docshell/test/navigation/test_bug279495.html
@@ -6,12 +6,12 @@
     <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
     <script type="text/javascript" src="NavigationUtils.js"></script>
 <script>
-window.onload = function() {
+window.onload = function () {
   document.getElementById("link0").href = target_url;
   document.getElementById("link1").href = target_url;
 
-  sendMouseEvent({type: "click"}, "link0");
-  sendMouseEvent({type: "click"}, "link1");
+  sendMouseEvent({type:"click"}, "link0");
+  sendMouseEvent({type:"click"}, "link1");
 
   xpcWaitForFinishedFrames(function() {
     countAndClose("window0", 1);
@@ -20,7 +20,7 @@ window.onload = function() {
     xpcCleanupWindows();
     SimpleTest.finish();
   }, 2);
-};
+}
 
 function countAndClose(name, expected_count) {
   var array_of_frames = xpcGetFramesByName(name);
@@ -28,7 +28,7 @@ function countAndClose(name, expected_count) {
      "Should only open " + expected_count +
      " window(s) with name " + name + " using a fancy hyperlink.");
 
-  for (var i = 0; i < array_of_frames.length; ++i)
+  for (var i=0; i < array_of_frames.length; ++i)
     array_of_frames[i].close();
 }
 </script>
diff --git a/docshell/test/navigation/test_bug344861.html b/docshell/test/navigation/test_bug344861.html
index 4cc2eed1a3eb..f9759751c966 100644
--- a/docshell/test/navigation/test_bug344861.html
+++ b/docshell/test/navigation/test_bug344861.html
@@ -21,12 +21,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=344861
 SimpleTest.waitForExplicitFinish();
 
 var newwindow = window.open("/", "testwindow", "width=200,height=200");
-newwindow.onload = function() {
+newwindow.onload = function() { 
   is(newwindow.innerHeight, 200, "window.open has correct height dimensions");
   is(newwindow.innerWidth, 200, "window.open has correct width dimensions");
   SimpleTest.finish();
   newwindow.close();
-};
+}
 </script>
 </pre>
 </body>
diff --git a/docshell/test/navigation/test_bug386782.html b/docshell/test/navigation/test_bug386782.html
index 1f11a93821c4..64dfc0dd0733 100644
--- a/docshell/test/navigation/test_bug386782.html
+++ b/docshell/test/navigation/test_bug386782.html
@@ -21,20 +21,20 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=386782
       {
         // <html><body><p>designModeDocument</p></body></html>
         url: "file_bug386782_designmode.html",
-        name: "designModeNavigate",
+        name: 'designModeNavigate',
         onload(doc) { doc.designMode = "on"; },
-        expectedBodyBeforeEdit: "<p>designModeDocument</p>",
-        expectedBodyAfterEdit:  "<p>EDITED designModeDocument</p>",
-        expectedBodyAfterSecondEdit: "<p>EDITED TWICE designModeDocument</p>",
+        expectedBodyBeforeEdit: '<p>designModeDocument</p>',
+        expectedBodyAfterEdit:  '<p>EDITED designModeDocument</p>',
+        expectedBodyAfterSecondEdit: '<p>EDITED TWICE designModeDocument</p>',
       },
       {
         // <html><body contentEditable="true"><p>contentEditable</p></body></html>
         url: "file_bug386782_contenteditable.html",
-        name: "contentEditableNavigate",
-        expectedBodyBeforeEdit: "<p>contentEditable</p>",
-        expectedBodyAfterEdit:  "EDITED <br><p>contentEditable</p>",
-        expectedBodyAfterSecondEdit: "EDITED TWICE <br><p>contentEditable</p>",
-      },
+        name: 'contentEditableNavigate',
+        expectedBodyBeforeEdit: '<p>contentEditable</p>',
+        expectedBodyAfterEdit:  'EDITED <br><p>contentEditable</p>',
+        expectedBodyAfterSecondEdit: 'EDITED TWICE <br><p>contentEditable</p>',
+      }
     ];
 
     var gTestNum = -1;
@@ -66,10 +66,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=386782
       // WARNING: If the following test fails, give the setTimeout() in the onload()
       // a bit longer; the doc hasn't had enough time to setup its editor.
       is(gTest.window.document.body.innerHTML, gTest.expectedBodyBeforeEdit, "Is doc setup yet");
-      sendString("EDITED ", gTest.window);
+      sendString('EDITED ', gTest.window);
       is(gTest.window.document.body.innerHTML, gTest.expectedBodyAfterEdit, "Editing failed.");
 
-      gTest.window.location = "about:blank";
+      gTest.window.location = 'about:blank';
       SimpleTest.waitForFocus(goBack, gTest.window);
     }
 
@@ -101,7 +101,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=386782
 
       // Check that we can still edit the page.
       gTest.window.document.body.focus();
-      sendString("TWICE ", gTest.window);
+      sendString('TWICE ', gTest.window);
       is(gTest.window.document.body.innerHTML, gTest.expectedBodyAfterSecondEdit, "Can we still edit?");
 
       gTest.window.close();
diff --git a/docshell/test/navigation/test_bug430624.html b/docshell/test/navigation/test_bug430624.html
index 342e5b2cd430..884025a8aea1 100644
--- a/docshell/test/navigation/test_bug430624.html
+++ b/docshell/test/navigation/test_bug430624.html
@@ -25,7 +25,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=430624
 
 function onLoad() {
   window.frames[0].frameElement.onload = onReload;
-  // eslint-disable-next-line no-self-assign
   window.frames[0].frameElement.srcdoc = window.frames[0].frameElement.srcdoc;
 }
 
@@ -38,7 +37,7 @@ function onReload() {
 function doTest() {
   var bodyElement = window.frames[0].frameElement.contentDocument.body;
   bodyElement.focus();
-  sendString("Still ", window.frames[0].frameElement.contentWindow);
+  sendString('Still ', window.frames[0].frameElement.contentWindow);
 
   is(bodyElement.innerHTML, "Still contentEditable", "Check we're contentEditable after reload");
 
diff --git a/docshell/test/navigation/test_bug430723.html b/docshell/test/navigation/test_bug430723.html
index 6f22a5e7dbfb..d9802c54a5ee 100644
--- a/docshell/test/navigation/test_bug430723.html
+++ b/docshell/test/navigation/test_bug430723.html
@@ -17,7 +17,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=430723
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
-// <![CDATA[
+//<![CDATA[
 
 /** Test for Bug 430723 **/
 
@@ -32,58 +32,59 @@ var testNum = 0;
 
 var smoothScrollPref = "general.smoothScroll";
 function runTest() {
-  SpecialPowers.pushPrefEnv({"set": [[smoothScrollPref, false]]}, function() {
+  SpecialPowers.pushPrefEnv({"set":[[smoothScrollPref, false]]}, function(){
     testWindow = window.open(gTallRedBoxURI, "testWindow", "width=300,height=300,location=yes,scrollbars=yes");
   });
 }
 
-var nextTest = function() {
+var nextTest =function() {
   testNum++;
   switch (testNum) {
     case 1: setTimeout(step1, 0); break;
     case 2: setTimeout(step2, 0); break;
     case 3: setTimeout(step3, 0); break;
-  }
-};
+  };
+}
 
-var step1 = function() {
+var step1 =function() {
   window.is(String(testWindow.location), gTallRedBoxURI, "Ensure red page loaded.");
-
+  
   // Navigate down and up.
   is(testWindow.document.body.scrollTop, 0,
      "Page1: Ensure the scrollpane is at the top before we start scrolling.");
-  testWindow.addEventListener("scroll", function() {
+  testWindow.addEventListener("scroll", function () {
     isnot(testWindow.document.body.scrollTop, 0,
           "Page1: Ensure we can scroll down.");
     SimpleTest.executeSoon(step1_2);
   }, {capture: true, once: true});
-  sendKey("DOWN", testWindow);
+  sendKey('DOWN', testWindow);
 
   function step1_2() {
-    testWindow.addEventListener("scroll", function() {
+    testWindow.addEventListener("scroll", function () {
       is(testWindow.document.body.scrollTop, 0,
-         "Page1: Ensure we can scroll up, back to the top.");
+         "Page1: Ensure we can scroll up, back to the top.");  
 
       // Nav to blue box page. This should fire step2.
       testWindow.location = gTallBlueBoxURI;
     }, {capture: true, once: true});
-    sendKey("UP", testWindow);
+    sendKey('UP', testWindow);
   }
-};
+}
 
 
-var step2 = function() {
+var step2 =function() {    
   window.is(String(testWindow.location), gTallBlueBoxURI, "Ensure blue page loaded.");
 
   // Scroll around a bit.
   is(testWindow.document.body.scrollTop, 0,
      "Page2: Ensure the scrollpane is at the top before we start scrolling.");
 
-  var scrollTest = function() {
+  var count = 0;
+  testWindow.addEventListener("scroll", function () {
     if (++count < 2) {
-      SimpleTest.executeSoon(function() { sendKey("DOWN", testWindow); });
+      SimpleTest.executeSoon(function () { sendKey('DOWN', testWindow); });
     } else {
-      testWindow.removeEventListener("scroll", scrollTest, true);
+      testWindow.removeEventListener("scroll", arguments.callee, true);
 
       isnot(testWindow.document.body.scrollTop, 0,
             "Page2: Ensure we could scroll.");
@@ -91,33 +92,30 @@ var step2 = function() {
       // Navigate backwards. This should fire step3.
       testWindow.history.back();
     }
-  };
+  }, true);
+  sendKey('DOWN', testWindow);
+}
 
-  var count = 0;
-  testWindow.addEventListener("scroll", scrollTest, true);
-  sendKey("DOWN", testWindow);
-};
-
-var step3 = function() {
+var step3 =function() {
   window.is(String(testWindow.location), gTallRedBoxURI,
             "Ensure red page restored from history.");
 
   // Check we can still scroll with the keys.
   is(testWindow.document.body.scrollTop, 0,
-     "Page1Again: Ensure scroll pane at top before we scroll.");
-  testWindow.addEventListener("scroll", function() {
+     "Page1Again: Ensure scroll pane at top before we scroll.");  
+  testWindow.addEventListener("scroll", function () {
     isnot(testWindow.document.body.scrollTop, 0,
-          "Page2Again: Ensure we can still scroll.");
+          "Page2Again: Ensure we can still scroll.");  
 
     testWindow.close();
     window.SimpleTest.finish();
   }, {capture: true, once: true});
-  sendKey("DOWN", testWindow);
-};
+  sendKey('DOWN', testWindow);
+}
 
 SimpleTest.waitForExplicitFinish();
 
-// ]]>
+//]]>
 </script>
 </pre>
 </body>
diff --git a/docshell/test/navigation/test_child.html b/docshell/test/navigation/test_child.html
index a2c8eb5d8fe2..c43e1a6cf0ba 100644
--- a/docshell/test/navigation/test_child.html
+++ b/docshell/test/navigation/test_child.html
@@ -28,7 +28,7 @@ window.onload = function() {
     xpcCleanupWindows();
     SimpleTest.finish();
   }, 4);
-};
+}
 </script>
 </head>
 <body>
diff --git a/docshell/test/navigation/test_contentpolicy_block_window.html b/docshell/test/navigation/test_contentpolicy_block_window.html
index 6dcd0a18e384..c597a4529044 100644
--- a/docshell/test/navigation/test_contentpolicy_block_window.html
+++ b/docshell/test/navigation/test_contentpolicy_block_window.html
@@ -24,9 +24,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1329288
  * gets called with the right (a non null) 'context' for the TYPE_DOCUMENT load.
  */
 
-// Services.jsm is disabled as ChromeUtils appears to be out of scope
-/* eslint-disable mozilla/use-services */
-
 const Cc = SpecialPowers.Cc;
 const Ci = SpecialPowers.Ci;
 
@@ -39,8 +36,7 @@ var policyID = SpecialPowers.wrap(SpecialPowers.Components).ID("{b80e19d0-878f-d
 var policyName = "@mozilla.org/testpolicy;1";
 var policy = {
   // nsISupports implementation
-  // eslint-disable-next-line mozilla/use-chromeutils-generateqi
-  QueryInterface(iid) {
+  QueryInterface: function(iid) {
     iid = SpecialPowers.wrap(iid);
     if (iid.equals(Ci.nsISupports) ||
         iid.equals(Ci.nsIFactory) ||
@@ -50,12 +46,12 @@ var policy = {
   },
 
   // nsIFactory implementation
-  createInstance(outer, iid) {
+  createInstance: function(outer, iid) {
     return this.QueryInterface(iid);
   },
 
   // nsIContentPolicy implementation
-  shouldLoad(contentLocation, loadInfo, mimeTypeGuess) {
+  shouldLoad: function(contentLocation, loadInfo, mimeTypeGuess) {
     let contentType = loadInfo.externalContentPolicyType;
     let context = loadInfo.loadingContext;
 
@@ -83,10 +79,10 @@ var policy = {
     return Ci.nsIContentPolicy.REJECT_REQUEST;
   },
 
-  shouldProcess(contentLocation, loadInfo, mimeTypeGuess) {
+  shouldProcess: function(contentLocation, loadInfo, mimeTypeGuess) {
     return Ci.nsIContentPolicy.ACCEPT;
-  },
-};
+  }
+}
 
 policy = SpecialPowers.wrapCallbackObject(policy);
 componentManager.registerFactory(policyID, "Test content policy", policyName, policy);
@@ -95,7 +91,7 @@ categoryManager.addCategoryEntry("content-policy", policyName, policyName, false
 SimpleTest.waitForExplicitFinish();
 
 // now everything is set up, let's start the test
-document.getElementById("testlink").click();
+document.getElementById("testlink").click()
 
 </script>
 </body>
diff --git a/docshell/test/navigation/test_grandchild.html b/docshell/test/navigation/test_grandchild.html
index 795f18b0c1cd..439145b3edb6 100644
--- a/docshell/test/navigation/test_grandchild.html
+++ b/docshell/test/navigation/test_grandchild.html
@@ -13,7 +13,7 @@ if (!navigator.platform.startsWith("Win")) {
   SimpleTest.expectAssertions(0, 1);
 }
 
-window.onload = function() {
+window.onload = function () {
   navigateByLocation(frames[0].frames[0]);
   navigateByOpen("child1_child0");
   navigateByForm("child2_child0");
@@ -28,7 +28,7 @@ window.onload = function() {
     xpcCleanupWindows();
     SimpleTest.finish();
   }, 4);
-};
+}
 </script>
 </head>
 <body>
diff --git a/docshell/test/navigation/test_not-opener.html b/docshell/test/navigation/test_not-opener.html
index 8bf6c8af8bcc..d778f71d9c93 100644
--- a/docshell/test/navigation/test_not-opener.html
+++ b/docshell/test/navigation/test_not-opener.html
@@ -13,8 +13,8 @@ if (!navigator.platform.startsWith("Win")) {
   SimpleTest.expectAssertions(0, 1);
 }
 
-window.onload = function() {
-  // navigateByLocation(window0);  // Don't have a handle to the window.
+window.onload = function () {
+  //navigateByLocation(window0);  // Don't have a handle to the window.
   navigateByOpen("window1");
   navigateByForm("window2");
   navigateByHyperlink("window3");
@@ -24,7 +24,7 @@ window.onload = function() {
     is(xpcGetFramesByName("window2").length, 2, "Should not be able to navigate popup's popup by submitting form.");
     is(xpcGetFramesByName("window3").length, 2, "Should not be able to navigate popup's popup by targeted hyperlink.");
 
-    // opener0.close();
+    //opener0.close();
     opener1.close();
     opener2.close();
     opener3.close();
@@ -32,12 +32,12 @@ window.onload = function() {
     xpcCleanupWindows();
     SimpleTest.finish();
   }, 6);
-};
+}
 
-// opener0 = window.open("http://test1.example.org:80/tests/docshell/test/navigation/open.html#window0", "_blank", "width=10,height=10");
-let opener1 = window.open("http://test1.example.org:80/tests/docshell/test/navigation/open.html#window1", "_blank", "width=10,height=10");
-let opener2 = window.open("http://test1.example.org:80/tests/docshell/test/navigation/open.html#window2", "_blank", "width=10,height=10");
-let opener3 = window.open("http://test1.example.org:80/tests/docshell/test/navigation/open.html#window3", "_blank", "width=10,height=10");
+//opener0 = window.open("http://test1.example.org:80/tests/docshell/test/navigation/open.html#window0", "_blank", "width=10,height=10");
+opener1 = window.open("http://test1.example.org:80/tests/docshell/test/navigation/open.html#window1", "_blank", "width=10,height=10");
+opener2 = window.open("http://test1.example.org:80/tests/docshell/test/navigation/open.html#window2", "_blank", "width=10,height=10");
+opener3 = window.open("http://test1.example.org:80/tests/docshell/test/navigation/open.html#window3", "_blank", "width=10,height=10");
 </script>
 </head>
 <body>
diff --git a/docshell/test/navigation/test_opener.html b/docshell/test/navigation/test_opener.html
index 0a7e9288f449..bfb1dde9f773 100644
--- a/docshell/test/navigation/test_opener.html
+++ b/docshell/test/navigation/test_opener.html
@@ -13,7 +13,7 @@ if (navigator.platform.startsWith("Linux")) {
   SimpleTest.expectAssertions(0, 1);
 }
 
-window.onload = function() {
+window.onload = function () {
   navigateByLocation(window0);
   navigateByOpen("window1");
   navigateByForm("window2");
@@ -33,7 +33,7 @@ window.onload = function() {
     xpcCleanupWindows();
     SimpleTest.finish();
   }, 4);
-};
+}
 
 var window0 = window.open("http://test1.example.org:80/tests/docshell/test/navigation/blank.html", "window0", "width=10,height=10");
 var window1 = window.open("http://test1.example.org:80/tests/docshell/test/navigation/blank.html", "window1", "width=10,height=10");
diff --git a/docshell/test/navigation/test_popup-navigates-children.html b/docshell/test/navigation/test_popup-navigates-children.html
index c809e17ba99d..692f35713cd5 100644
--- a/docshell/test/navigation/test_popup-navigates-children.html
+++ b/docshell/test/navigation/test_popup-navigates-children.html
@@ -9,12 +9,6 @@
       iframe { width: 90%; height: 50px; }
     </style>
 <script>
-
-let window0 = null;
-let window1 = null;
-let window2 = null;
-let window3 = null;
-
 function testChild0() {
   if (!window.window0)
     window0 = window.open("navigate.html#opener.frames[0],location", "window0", "width=10,height=10");
diff --git a/docshell/test/navigation/test_reserved.html b/docshell/test/navigation/test_reserved.html
index 45e0d14a5510..b2389078c746 100644
--- a/docshell/test/navigation/test_reserved.html
+++ b/docshell/test/navigation/test_reserved.html
@@ -14,28 +14,28 @@ if (navigator.platform.startsWith("Mac")) {
 }
 
 function testTop() {
-  let window0 = window.open("iframe.html#http://test1.example.org:80/tests/docshell/test/navigation/navigate.html#top,location", "_blank", "width=10,height=10");
+  window0 = window.open("iframe.html#http://test1.example.org:80/tests/docshell/test/navigation/navigate.html#top,location", "_blank", "width=10,height=10");
 
   xpcWaitForFinishedFrames(function() {
     isInaccessible(window0, "Should be able to navigate off-domain top by setting location.");
     window0.close();
     xpcCleanupWindows();
 
-    let window1 = window.open("iframe.html#http://test1.example.org:80/tests/docshell/test/navigation/navigate.html#_top,open", "_blank", "width=10,height=10");
-
+    window1 = window.open("iframe.html#http://test1.example.org:80/tests/docshell/test/navigation/navigate.html#_top,open", "_blank", "width=10,height=10");
+    
     xpcWaitForFinishedFrames(function() {
       isInaccessible(window1, "Should be able to navigate off-domain top by calling window.open.");
       window1.close();
       xpcCleanupWindows();
 
-      let window2 = window.open("iframe.html#http://test1.example.org:80/tests/docshell/test/navigation/navigate.html#_top,form", "_blank", "width=10,height=10");
+      window2 = window.open("iframe.html#http://test1.example.org:80/tests/docshell/test/navigation/navigate.html#_top,form", "_blank", "width=10,height=10");
 
       xpcWaitForFinishedFrames(function() {
         isInaccessible(window2, "Should be able to navigate off-domain top by submitting form.");
         window2.close();
         xpcCleanupWindows();
 
-        let window3 = window.open("iframe.html#http://test1.example.org:80/tests/docshell/test/navigation/navigate.html#_top,hyperlink", "_blank", "width=10,height=10");
+        window3 = window.open("iframe.html#http://test1.example.org:80/tests/docshell/test/navigation/navigate.html#_top,hyperlink", "_blank", "width=10,height=10");
 
         xpcWaitForFinishedFrames(function() {
           isInaccessible(window3, "Should be able to navigate off-domain top by targeted hyperlink.");
@@ -84,7 +84,7 @@ function testParent() {
 
 window.onload = function() {
   testTop();
-};
+}
 </script>
 </head>
 <body>
diff --git a/docshell/test/navigation/test_sessionhistory.html b/docshell/test/navigation/test_sessionhistory.html
index c2c24f5e5dc1..fb4cfc08512c 100644
--- a/docshell/test/navigation/test_sessionhistory.html
+++ b/docshell/test/navigation/test_sessionhistory.html
@@ -25,7 +25,7 @@ var testFiles =
     "file_bug462076_3.html",         // Dynamic frames after onload
     "file_bug508537_1.html",         // Dynamic frames and forward-back
     "file_document_write_1.html",    // Session history + document.write
-    // "file_static_and_dynamic_1.html",// Static and dynamic frames and forward-back
+    //"file_static_and_dynamic_1.html",// Static and dynamic frames and forward-back
     "file_bug534178.html",           // Session history entry clean-up.
     "file_fragment_handling_during_load.html",
     "file_nested_frames.html",
@@ -48,7 +48,7 @@ function nextTest_() {
     let nextFile = testFiles.shift();
     info("Running " + nextFile);
     testWindow = window.open(nextFile, "", "width=360,height=480");
-    testWindow.onunload = function() { }; // to prevent bfcache
+    testWindow.onunload = function () { } // to prevent bfcache
   } else {
     SimpleTest.finish();
   }
diff --git a/docshell/test/navigation/test_sibling-matching-parent.html b/docshell/test/navigation/test_sibling-matching-parent.html
index c4881b2442bc..dc8ec2f905e4 100644
--- a/docshell/test/navigation/test_sibling-matching-parent.html
+++ b/docshell/test/navigation/test_sibling-matching-parent.html
@@ -9,8 +9,8 @@
       iframe { width: 90%; height: 50px; }
     </style>
 <script>
-window.onload = function() {
-  document.getElementById("active").innerHTML =
+window.onload = function () {
+  document.getElementById('active').innerHTML =
       '<iframe src="navigate.html#parent.frames[0],location"></iframe>' +
       '<iframe src="navigate.html#child1,open"></iframe>' +
       '<iframe src="navigate.html#child2,form"></iframe>' +
@@ -25,7 +25,7 @@ window.onload = function() {
     xpcCleanupWindows();
     SimpleTest.finish();
   }, 4);
-};
+}
 </script>
 </head>
 <body>
diff --git a/docshell/test/navigation/test_sibling-off-domain.html b/docshell/test/navigation/test_sibling-off-domain.html
index a02958c9a1b5..ba7942798ee6 100644
--- a/docshell/test/navigation/test_sibling-off-domain.html
+++ b/docshell/test/navigation/test_sibling-off-domain.html
@@ -9,8 +9,8 @@
       iframe { width: 90%; height: 50px; }
     </style>
 <script>
-window.onload = function() {
-  document.getElementById("active").innerHTML =
+window.onload = function () {
+  document.getElementById('active').innerHTML =
       '<iframe src="http://test1.example.org:80/tests/docshell/test/navigation/navigate.html#parent.frames[0],location"></iframe>' +
       '<iframe src="http://test1.example.org:80/tests/docshell/test/navigation/navigate.html#child1,open"></iframe>' +
       '<iframe src="http://test1.example.org:80/tests/docshell/test/navigation/navigate.html#child2,form"></iframe>' +
@@ -25,7 +25,7 @@ window.onload = function() {
     xpcCleanupWindows();
     SimpleTest.finish();
   }, 4);
-};
+}
 </script>
 </head>
 <body>
diff --git a/docshell/test/navigation/test_triggeringprincipal_frame_nav.html b/docshell/test/navigation/test_triggeringprincipal_frame_nav.html
index 2c783191c500..fa6e0e03d2b7 100644
--- a/docshell/test/navigation/test_triggeringprincipal_frame_nav.html
+++ b/docshell/test/navigation/test_triggeringprincipal_frame_nav.html
@@ -48,9 +48,9 @@ window.addEventListener("message", receiveMessage);
 
 function receiveMessage(event) {
   is(event.data.triggeringPrincipalURI, TRIGGERINGPRINCIPALURI,
-     "TriggeringPrincipal should be the navigating iframe (Frame 1)");
+  	 "TriggeringPrincipal should be the navigating iframe (Frame 1)");
   is(event.data.loadingPrincipalURI, LOADINGPRINCIPALURI,
-     "LoadingPrincipal should be the enclosing iframe (Frame 2)");
+  	 "LoadingPrincipal should be the enclosing iframe (Frame 2)");
   is(event.data.referrerURI, TRIGGERINGPRINCIPALURI,
      "Referrer and TriggeringPrincipal should be identical (Frame 1)");
 
diff --git a/docshell/test/navigation/test_triggeringprincipal_iframe_iframe_window_open.html b/docshell/test/navigation/test_triggeringprincipal_iframe_iframe_window_open.html
index a1267a4697c2..0662a01a3332 100644
--- a/docshell/test/navigation/test_triggeringprincipal_iframe_iframe_window_open.html
+++ b/docshell/test/navigation/test_triggeringprincipal_iframe_iframe_window_open.html
@@ -18,16 +18,16 @@
  * TriggeringPrincipal and LoadingPrincipal of the navigated iframe (Frame A).
  *
  * +---------------------------------------+
- * |   Parent                              |
- * |                                       |
+ * |   Parent                              | 
+ * |                                       |   
  * |  +----------------------------+       |
- * |  | Frame A                    |       |
+ * |  | Frame A                    |       | 
  * |  |                            |       |
  * |  |                            |       |
  * |  +----------------------------+       |
- * |                                       |
+ * |                                       |   
  * |  +----------------------------+       |
- * |  | Frame B                    |       |
+ * |  | Frame B                    |       | 
  * |  |                            |       |
  * |  | win.open("http://", "A")   |       |
  * |  +----------------------------+       |
@@ -49,7 +49,7 @@ const LOADING_PRINCIPAL_URI =
 var frameA = document.getElementById("framea");
 
 function checkResults() {
-  frameA.removeEventListener("load", checkResults);
+  frameA.removeEventListener('load', checkResults);
 
   var channel = SpecialPowers.wrap(frameA.contentWindow).docShell.currentDocumentChannel;
   var triggeringPrincipal = channel.loadInfo.triggeringPrincipal.URI.asciiSpec;
@@ -63,13 +63,13 @@ function checkResults() {
 
   is(loadingPrincipal, LOADING_PRINCIPAL_URI,
     "LoadingPrincipal for targeted window.open() should be the containing document");
-
+ 
   SimpleTest.finish();
 }
 
 function performNavigation() {
-  frameA.removeEventListener("load", performNavigation);
-  frameA.addEventListener("load", checkResults);
+  frameA.removeEventListener('load', performNavigation);
+  frameA.addEventListener('load', checkResults);
 
   // load Frame B which then navigates Frame A
   var frameB = document.getElementById("frameb");
@@ -79,7 +79,7 @@ function performNavigation() {
 // start the test
 SimpleTest.waitForExplicitFinish();
 
-frameA.addEventListener("load", performNavigation);
+frameA.addEventListener('load', performNavigation);
 
 </script>
 </pre>
diff --git a/docshell/test/navigation/test_triggeringprincipal_parent_iframe_window_open.html b/docshell/test/navigation/test_triggeringprincipal_parent_iframe_window_open.html
index 414878bc1314..4c0897ac7b28 100644
--- a/docshell/test/navigation/test_triggeringprincipal_parent_iframe_window_open.html
+++ b/docshell/test/navigation/test_triggeringprincipal_parent_iframe_window_open.html
@@ -17,13 +17,13 @@
  * TriggeringPrincipal and LoadingPrincipal of the navigated iframe.
  *
  * +------------------------------------------+
- * |                                          |
+ * |                                          | 
  * |  +------------------+                    |
- * |  | testframe        |                    |
+ * |  | testframe        |                    | 
  * |  +------------------+                    |
- * |                                          |
+ * |                                          | 
  * | window.open("http://", "testframe");     |
- * |                                          |
+ * |                                          | 
  * +------------------------------------------+
  */
 
@@ -35,7 +35,7 @@ const LOADING_PRINCIPAL_URI = TRIGGERING_PRINCIPAL_URI;
 var testframe = document.getElementById("testframe");
 
 function checkResults() {
-  testframe.removeEventListener("load", checkResults);
+  testframe.removeEventListener('load', checkResults);
 
   var channel = SpecialPowers.wrap(testframe.contentWindow).docShell.currentDocumentChannel;
   var triggeringPrincipal = channel.loadInfo.triggeringPrincipal.URI.asciiSpec;
@@ -49,20 +49,20 @@ function checkResults() {
 
   is(loadingPrincipal, LOADING_PRINCIPAL_URI,
     "LoadingPrincipal for targeted window.open() should be the <iframe>.ownerDocument");
-
+ 
   SimpleTest.finish();
 }
 
 function performNavigation() {
-  testframe.removeEventListener("load", performNavigation);
-  testframe.addEventListener("load", checkResults);
-  window.open("file_triggeringprincipal_parent_iframe_window_open_nav.html", "testframe");
+  testframe.removeEventListener('load', performNavigation);
+  testframe.addEventListener('load', checkResults);
+  win = window.open("file_triggeringprincipal_parent_iframe_window_open_nav.html", "testframe");
 }
 
 // start the test
 SimpleTest.waitForExplicitFinish();
 
-testframe.addEventListener("load", performNavigation);
+testframe.addEventListener('load', performNavigation);
 
 </script>
 </pre>
diff --git a/docshell/test/navigation/test_triggeringprincipal_window_open.html b/docshell/test/navigation/test_triggeringprincipal_window_open.html
index aefabfd38ce5..677392c9bf1a 100644
--- a/docshell/test/navigation/test_triggeringprincipal_window_open.html
+++ b/docshell/test/navigation/test_triggeringprincipal_window_open.html
@@ -50,7 +50,7 @@ httpWin.onload = function() {
 
   httpWin.close();
   checkFinish();
-};
+}
 
 // ----------------------------------------------------------------------------
 // Test 2: window.open(javascript:)
@@ -71,7 +71,7 @@ jsWin.onload = function() {
 
   jsWin.close();
   checkFinish();
-};
+}
 
 </script>
 </pre>
diff --git a/docshell/test/unit/head_docshell.js b/docshell/test/unit/head_docshell.js
index c8f81bb8dbb5..517b04232432 100644
--- a/docshell/test/unit/head_docshell.js
+++ b/docshell/test/unit/head_docshell.js
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-ChromeUtils.import("resource://gre/modules/Services.jsm");
 
-var dirSvc = Services.dirSvc;
+var dirSvc = Cc["@mozilla.org/file/directory_service;1"].
+             getService(Ci.nsIProperties);
 var profileDir = do_get_profile();
diff --git a/docshell/test/unit/test_bug442584.js b/docshell/test/unit/test_bug442584.js
index 74e091fe60b7..7ac5ff871c2e 100644
--- a/docshell/test/unit/test_bug442584.js
+++ b/docshell/test/unit/test_bug442584.js
@@ -1,13 +1,15 @@
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 var prefetch = Cc["@mozilla.org/prefetch-service;1"].
                getService(Ci.nsIPrefetchService);
+var ios = Cc["@mozilla.org/network/io-service;1"].
+          getService(Ci.nsIIOService);
+var prefs = Cc["@mozilla.org/preferences-service;1"].
+            getService(Ci.nsIPrefBranch);
 
 function run_test() {
   // Fill up the queue
-  Services.prefs.setBoolPref("network.prefetch-next", true);
+  prefs.setBoolPref("network.prefetch-next", true);
   for (var i = 0; i < 5; i++) {
-    var uri = Services.io.newURI("http://localhost/" + i);
+    var uri = ios.newURI("http://localhost/" + i);
     prefetch.prefetchURI(uri, uri, null, true);
   }
 
@@ -15,14 +17,14 @@ function run_test() {
   Assert.ok(prefetch.hasMoreElements());
 
   // Now disable the pref to force the queue to empty...
-  Services.prefs.setBoolPref("network.prefetch-next", false);
+  prefs.setBoolPref("network.prefetch-next", false);
   Assert.ok(!prefetch.hasMoreElements());
 
   // Now reenable the pref, and add more items to the queue.
-  Services.prefs.setBoolPref("network.prefetch-next", true);
-  for (var k = 0; k < 5; k++) {
-    var uri2 = Services.io.newURI("http://localhost/" + k);
-    prefetch.prefetchURI(uri2, uri2, null, true);
+  prefs.setBoolPref("network.prefetch-next", true);
+  for (var i = 0; i < 5; i++) {
+    var uri = ios.newURI("http://localhost/" + i);
+    prefetch.prefetchURI(uri, uri, null, true);
   }
   Assert.ok(prefetch.hasMoreElements());
 }
diff --git a/docshell/test/unit/test_nsDefaultURIFixup.js b/docshell/test/unit/test_nsDefaultURIFixup.js
index 5db13a0304b1..5a0960b09438 100644
--- a/docshell/test/unit/test_nsDefaultURIFixup.js
+++ b/docshell/test/unit/test_nsDefaultURIFixup.js
@@ -1,83 +1,90 @@
-ChromeUtils.import("resource://gre/modules/Services.jsm");
+var urifixup = Cc["@mozilla.org/docshell/urifixup;1"].
+               getService(Ci.nsIURIFixup);
+var prefs = Cc["@mozilla.org/preferences-service;1"].
+            getService(Ci.nsIPrefBranch);
 
 var pref = "browser.fixup.typo.scheme";
 
 var data = [
   {
     // ttp -> http.
-    wrong: "ttp://www.example.com/",
-    fixed: "http://www.example.com/",
+    wrong: 'ttp://www.example.com/',
+    fixed: 'http://www.example.com/',
   },
   {
     // htp -> http.
-    wrong: "htp://www.example.com/",
-    fixed: "http://www.example.com/",
+    wrong: 'htp://www.example.com/',
+    fixed: 'http://www.example.com/',
   },
   {
     // ttps -> https.
-    wrong: "ttps://www.example.com/",
-    fixed: "https://www.example.com/",
+    wrong: 'ttps://www.example.com/',
+    fixed: 'https://www.example.com/',
   },
   {
     // tps -> https.
-    wrong: "tps://www.example.com/",
-    fixed: "https://www.example.com/",
+    wrong: 'tps://www.example.com/',
+    fixed: 'https://www.example.com/',
   },
   {
     // ps -> https.
-    wrong: "ps://www.example.com/",
-    fixed: "https://www.example.com/",
+    wrong: 'ps://www.example.com/',
+    fixed: 'https://www.example.com/',
   },
   {
     // htps -> https.
-    wrong: "htps://www.example.com/",
-    fixed: "https://www.example.com/",
+    wrong: 'htps://www.example.com/',
+    fixed: 'https://www.example.com/',
   },
   {
     // ile -> file.
-    wrong: "ile:///this/is/a/test.html",
-    fixed: "file:///this/is/a/test.html",
+    wrong: 'ile:///this/is/a/test.html',
+    fixed: 'file:///this/is/a/test.html',
   },
   {
     // le -> file.
-    wrong: "le:///this/is/a/test.html",
-    fixed: "file:///this/is/a/test.html",
+    wrong: 'le:///this/is/a/test.html',
+    fixed: 'file:///this/is/a/test.html',
   },
   {
     // Valid should not be changed.
-    wrong: "https://example.com/this/is/a/test.html",
-    fixed: "https://example.com/this/is/a/test.html",
+    wrong: 'https://example.com/this/is/a/test.html',
+    fixed: 'https://example.com/this/is/a/test.html',
   },
   {
     // Unmatched should not be changed.
-    wrong: "whatever://this/is/a/test.html",
-    fixed: "whatever://this/is/a/test.html",
+    wrong: 'whatever://this/is/a/test.html',
+    fixed: 'whatever://this/is/a/test.html',
   },
 ];
 
 var len = data.length;
 
+function run_test() {
+  run_next_test();
+}
+
 // Make sure we fix what needs fixing when there is no pref set.
 add_task(function test_unset_pref_fixes_typos() {
-  Services.prefs.clearUserPref(pref);
+  prefs.clearUserPref(pref);
   for (let i = 0; i < len; ++i) {
     let item = data[i];
     let result =
-      Services.uriFixup.createFixupURI(item.wrong,
-                              Services.uriFixup.FIXUP_FLAG_FIX_SCHEME_TYPOS).spec;
+      urifixup.createFixupURI(item.wrong,
+                              urifixup.FIXUP_FLAG_FIX_SCHEME_TYPOS).spec;
     Assert.equal(result, item.fixed);
   }
 });
-
+  
 // Make sure we don't do anything when the pref is explicitly
 // set to false.
 add_task(function test_false_pref_keeps_typos() {
-  Services.prefs.setBoolPref(pref, false);
+  prefs.setBoolPref(pref, false);
   for (let i = 0; i < len; ++i) {
     let item = data[i];
     let result =
-      Services.uriFixup.createFixupURI(item.wrong,
-                              Services.uriFixup.FIXUP_FLAG_FIX_SCHEME_TYPOS).spec;
+      urifixup.createFixupURI(item.wrong,
+                              urifixup.FIXUP_FLAG_FIX_SCHEME_TYPOS).spec;
     Assert.equal(result, item.wrong);
   }
 });
@@ -85,12 +92,12 @@ add_task(function test_false_pref_keeps_typos() {
 // Finally, make sure we still fix what needs fixing if the pref is
 // explicitly set to true.
 add_task(function test_true_pref_fixes_typos() {
-  Services.prefs.setBoolPref(pref, true);
+  prefs.setBoolPref(pref, true);
   for (let i = 0; i < len; ++i) {
     let item = data[i];
     let result =
-        Services.uriFixup.createFixupURI(item.wrong,
-                                Services.uriFixup.FIXUP_FLAG_FIX_SCHEME_TYPOS).spec;
+        urifixup.createFixupURI(item.wrong,
+                                urifixup.FIXUP_FLAG_FIX_SCHEME_TYPOS).spec;
     Assert.equal(result, item.fixed);
   }
 });
diff --git a/docshell/test/unit/test_nsDefaultURIFixup_info.js b/docshell/test/unit/test_nsDefaultURIFixup_info.js
index 91f5d47ff8d4..08345e7522ea 100644
--- a/docshell/test/unit/test_nsDefaultURIFixup_info.js
+++ b/docshell/test/unit/test_nsDefaultURIFixup_info.js
@@ -1,3 +1,6 @@
+var urifixup = Cc["@mozilla.org/docshell/urifixup;1"].
+               getService(Ci.nsIURIFixup);
+
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var prefList = ["browser.fixup.typo.scheme", "keyword.enabled",
@@ -37,16 +40,16 @@ registerCleanupFunction(function() {
 });
 
 var flagInputs = [
-  Services.uriFixup.FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP,
-  Services.uriFixup.FIXUP_FLAGS_MAKE_ALTERNATE_URI,
-  Services.uriFixup.FIXUP_FLAG_FIX_SCHEME_TYPOS,
+  urifixup.FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP,
+  urifixup.FIXUP_FLAGS_MAKE_ALTERNATE_URI,
+  urifixup.FIXUP_FLAG_FIX_SCHEME_TYPOS,
 ];
 
 flagInputs.concat([
   flagInputs[0] | flagInputs[1],
   flagInputs[1] | flagInputs[2],
   flagInputs[0] | flagInputs[2],
-  flagInputs[0] | flagInputs[1] | flagInputs[2],
+  flagInputs[0] | flagInputs[1] | flagInputs[2]
 ]);
 
 /*
@@ -202,25 +205,25 @@ var testcases = [ {
     input: "[64:ff9b::8.8.8.8]",
     fixedURI: "http://[64:ff9b::808:808]/",
     alternateURI: "http://[64:ff9b::808:808]/",
-    protocolChange: true,
+    protocolChange: true
   }, {
     input: "[64:ff9b::8.8.8.8]/~moz",
     fixedURI: "http://[64:ff9b::808:808]/~moz",
     alternateURI: "http://[64:ff9b::808:808]/~moz",
-    protocolChange: true,
+    protocolChange: true
   }, {
     input: "[::1][::1]",
     keywordLookup: true,
-    protocolChange: true,
+    protocolChange: true
   }, {
     input: "[::1][100",
     fixedURI: null,
     keywordLookup: true,
-    protocolChange: true,
+    protocolChange: true
   }, {
     input: "[::1]]",
     keywordLookup: true,
-    protocolChange: true,
+    protocolChange: true
   }, {
     input: "1234",
     fixedURI: "http://0.0.4.210/",
@@ -341,7 +344,7 @@ var testcases = [ {
     input: "café.local",
     fixedURI: "http://xn--caf-dma.local/",
     alternateURI: "http://www.xn--caf-dma.local/",
-    protocolChange: true,
+    protocolChange: true
   }, {
     input: "47.6182,-122.830",
     fixedURI: "http://47.6182,-122.830/",
@@ -382,38 +385,38 @@ var testcases = [ {
   }, {
     input: "moz ?.::%27",
     keywordLookup: true,
-    protocolChange: true,
+    protocolChange: true
   }, {
     input: "mozilla.com/?q=search",
     fixedURI: "http://mozilla.com/?q=search",
     alternateURI: "http://www.mozilla.com/?q=search",
-    protocolChange: true,
+    protocolChange: true
   }, {
     input: "mozilla.com?q=search",
     fixedURI: "http://mozilla.com/?q=search",
     alternateURI: "http://www.mozilla.com/?q=search",
-    protocolChange: true,
+    protocolChange: true
   }, {
     input: "mozilla.com ?q=search",
     keywordLookup: true,
-    protocolChange: true,
+    protocolChange: true
   }, {
     input: "mozilla.com.?q=search",
     fixedURI: "http://mozilla.com./?q=search",
-    protocolChange: true,
+    protocolChange: true
   }, {
     input: "mozilla.com'?q=search",
     fixedURI: "http://mozilla.com'/?q=search",
     alternateURI: "http://www.mozilla.com'/?q=search",
-    protocolChange: true,
+    protocolChange: true
   }, {
     input: "mozilla.com':search",
     keywordLookup: true,
-    protocolChange: true,
+    protocolChange: true
   }, {
     input: "[mozilla]",
     keywordLookup: true,
-    protocolChange: true,
+    protocolChange: true
   }, {
     input: "':?",
     fixedURI: "http://'/?",
@@ -432,7 +435,7 @@ var testcases = [ {
   }, {
     input: "' ?.com",
     keywordLookup: true,
-    protocolChange: true,
+    protocolChange: true
   }, {
     input: "?mozilla",
     keywordLookup: true,
@@ -575,14 +578,14 @@ function do_single_test_run() {
       let URIInfo;
       let fixupURIOnly = null;
       try {
-        fixupURIOnly = Services.uriFixup.createFixupURI(testInput, flags);
+        fixupURIOnly = urifixup.createFixupURI(testInput, flags);
       } catch (ex) {
         info("Caught exception: " + ex);
         Assert.equal(expectedFixedURI, null);
       }
 
       try {
-        URIInfo = Services.uriFixup.getFixupURIInfo(testInput, flags);
+        URIInfo = urifixup.getFixupURIInfo(testInput, flags);
       } catch (ex) {
         // Both APIs should return an error in the same cases.
         info("Caught exception: " + ex);
@@ -600,8 +603,10 @@ function do_single_test_run() {
         Assert.equal(fixupURIOnly.spec, URIInfo.preferredURI.spec, "Fixed and preferred URI should match");
       }
 
+      let isFileURL = expectedFixedURI && expectedFixedURI.startsWith("file");
+
       // Check the fixedURI:
-      let makeAlternativeURI = flags & Services.uriFixup.FIXUP_FLAGS_MAKE_ALTERNATE_URI;
+      let makeAlternativeURI = flags & urifixup.FIXUP_FLAGS_MAKE_ALTERNATE_URI;
       if (makeAlternativeURI && alternativeURI != null) {
         Assert.equal(URIInfo.fixedURI.spec, alternativeURI, "should have gotten alternate URI");
       } else {
@@ -609,7 +614,7 @@ function do_single_test_run() {
       }
 
       // Check booleans on input:
-      let couldDoKeywordLookup = flags & Services.uriFixup.FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP;
+      let couldDoKeywordLookup = flags & urifixup.FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP;
       Assert.equal(!!URIInfo.keywordProviderName, couldDoKeywordLookup && expectKeywordLookup, "keyword lookup as expected");
       Assert.equal(URIInfo.fixupChangedProtocol, expectProtocolChange, "protocol change as expected");
       Assert.equal(URIInfo.fixupCreatedAlternateURI, makeAlternativeURI && alternativeURI != null, "alternative URI as expected");
diff --git a/docshell/test/unit/test_nsDefaultURIFixup_search.js b/docshell/test/unit/test_nsDefaultURIFixup_search.js
index 5aeaa4d9373b..e32c985162a0 100644
--- a/docshell/test/unit/test_nsDefaultURIFixup_search.js
+++ b/docshell/test/unit/test_nsDefaultURIFixup_search.js
@@ -1,3 +1,5 @@
+var urifixup = Cc["@mozilla.org/docshell/urifixup;1"].
+               getService(Ci.nsIURIFixup);
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 
@@ -35,61 +37,61 @@ var isWin = AppConstants.platform == "win";
 var data = [
   {
     // Valid should not be changed.
-    wrong: "https://example.com/this/is/a/test.html",
-    fixed: "https://example.com/this/is/a/test.html",
+    wrong: 'https://example.com/this/is/a/test.html',
+    fixed: 'https://example.com/this/is/a/test.html',
   },
   {
     // Unrecognized protocols should be changed.
-    wrong: "whatever://this/is/a/test.html",
-    fixed: kSearchEngineURL.replace("{searchTerms}", encodeURIComponent("whatever://this/is/a/test.html")),
+    wrong: 'whatever://this/is/a/test.html',
+    fixed: kSearchEngineURL.replace("{searchTerms}", encodeURIComponent('whatever://this/is/a/test.html')),
   },
 
   // The following tests check that when a user:password is present in the URL
   // `user:` isn't treated as an unknown protocol thus leaking the user and
   // password to the search engine.
   {
-    wrong: "user:pass@example.com/this/is/a/test.html",
-    fixed: "http://user:pass@example.com/this/is/a/test.html",
+    wrong: 'user:pass@example.com/this/is/a/test.html',
+    fixed: 'http://user:pass@example.com/this/is/a/test.html',
   },
   {
-    wrong: "user@example.com:8080/this/is/a/test.html",
-    fixed: "http://user@example.com:8080/this/is/a/test.html",
+    wrong: 'user@example.com:8080/this/is/a/test.html',
+    fixed: 'http://user@example.com:8080/this/is/a/test.html',
   },
   {
-    wrong: "https:pass@example.com/this/is/a/test.html",
-    fixed: "https://pass@example.com/this/is/a/test.html",
+    wrong: 'https:pass@example.com/this/is/a/test.html',
+    fixed: 'https://pass@example.com/this/is/a/test.html',
   },
   {
-    wrong: "user:pass@example.com:8080/this/is/a/test.html",
-    fixed: "http://user:pass@example.com:8080/this/is/a/test.html",
+    wrong: 'user:pass@example.com:8080/this/is/a/test.html',
+    fixed: 'http://user:pass@example.com:8080/this/is/a/test.html',
   },
   {
-    wrong: "http:user:pass@example.com:8080/this/is/a/test.html",
-    fixed: "http://user:pass@example.com:8080/this/is/a/test.html",
+    wrong: 'http:user:pass@example.com:8080/this/is/a/test.html',
+    fixed: 'http://user:pass@example.com:8080/this/is/a/test.html',
   },
   {
-    wrong: "ttp:user:pass@example.com:8080/this/is/a/test.html",
-    fixed: "http://user:pass@example.com:8080/this/is/a/test.html",
+    wrong: 'ttp:user:pass@example.com:8080/this/is/a/test.html',
+    fixed: 'http://user:pass@example.com:8080/this/is/a/test.html',
   },
   {
-    wrong: "gobbledygook:user:pass@example.com:8080/this/is/a/test.html",
-    fixed: "http://gobbledygook:user%3Apass@example.com:8080/this/is/a/test.html",
+    wrong: 'gobbledygook:user:pass@example.com:8080/this/is/a/test.html',
+    fixed: 'http://gobbledygook:user%3Apass@example.com:8080/this/is/a/test.html',
   },
   {
-    wrong: "user:@example.com:8080/this/is/a/test.html",
-    fixed: "http://user@example.com:8080/this/is/a/test.html",
+    wrong: 'user:@example.com:8080/this/is/a/test.html',
+    fixed: 'http://user@example.com:8080/this/is/a/test.html',
   },
   {
-    wrong: "//user:pass@example.com:8080/this/is/a/test.html",
-    fixed: (isWin ? "http:" : "file://") + "//user:pass@example.com:8080/this/is/a/test.html",
+    wrong: '//user:pass@example.com:8080/this/is/a/test.html',
+    fixed: (isWin ? "http:" : "file://") + '//user:pass@example.com:8080/this/is/a/test.html',
   },
   {
-    wrong: "://user:pass@example.com:8080/this/is/a/test.html",
-    fixed: "http://user:pass@example.com:8080/this/is/a/test.html",
+    wrong: '://user:pass@example.com:8080/this/is/a/test.html',
+    fixed: 'http://user:pass@example.com:8080/this/is/a/test.html',
   },
   {
-    wrong: "whatever://this/is/a@b/test.html",
-    fixed: kSearchEngineURL.replace("{searchTerms}", encodeURIComponent("whatever://this/is/a@b/test.html")),
+    wrong: 'whatever://this/is/a@b/test.html',
+    fixed: kSearchEngineURL.replace("{searchTerms}", encodeURIComponent('whatever://this/is/a@b/test.html')),
   },
 ];
 
@@ -99,18 +101,22 @@ var extProtocolSvc = Cc["@mozilla.org/uriloader/external-protocol-service;1"]
 if (extProtocolSvc && extProtocolSvc.externalProtocolHandlerExists("mailto")) {
   data.push({
     wrong: "mailto:foo@bar.com",
-    fixed: "mailto:foo@bar.com",
+    fixed: "mailto:foo@bar.com"
   });
 }
 
+function run_test() {
+  run_next_test();
+}
+
 var len = data.length;
 // Make sure we fix what needs fixing
 add_task(function test_fix_unknown_schemes() {
   for (let i = 0; i < len; ++i) {
     let item = data[i];
     let result =
-      Services.uriFixup.createFixupURI(item.wrong,
-                              Services.uriFixup.FIXUP_FLAG_FIX_SCHEME_TYPOS).spec;
+      urifixup.createFixupURI(item.wrong,
+                              urifixup.FIXUP_FLAG_FIX_SCHEME_TYPOS).spec;
     Assert.equal(result, item.fixed);
   }
 });
diff --git a/docshell/test/unit/test_pb_notification.js b/docshell/test/unit/test_pb_notification.js
index ba4ea9e22166..40289471731c 100644
--- a/docshell/test/unit/test_pb_notification.js
+++ b/docshell/test/unit/test_pb_notification.js
@@ -1,6 +1,6 @@
 function destroy_transient_docshell() {
   let windowlessBrowser = Services.appShell.createWindowlessBrowser(false);
-  windowlessBrowser.docShell.setOriginAttributes({privateBrowsingId: 1});
+  windowlessBrowser.docshell.setOriginAttributes({privateBrowsingId : 1});
   windowlessBrowser.close();
   do_test_pending();
   do_timeout(0, Cu.forceGC);
@@ -8,11 +8,12 @@ function destroy_transient_docshell() {
 
 function run_test() {
   var obs = {
-    observe(aSubject, aTopic, aData) {
+    observe: function(aSubject, aTopic, aData) {
       Assert.equal(aTopic, "last-pb-context-exited");
       do_test_finished();
-    },
+    }
   };
-  Services.obs.addObserver(obs, "last-pb-context-exited");
+  var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+  os.addObserver(obs, "last-pb-context-exited");
   destroy_transient_docshell();
 }
diff --git a/docshell/test/unit/test_privacy_transition.js b/docshell/test/unit/test_privacy_transition.js
index bb4f21faf1e0..e7cfddb9abd4 100644
--- a/docshell/test/unit/test_privacy_transition.js
+++ b/docshell/test/unit/test_privacy_transition.js
@@ -3,18 +3,24 @@ var gNotifications = 0;
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var observer = {
-  QueryInterface: ChromeUtils.generateQI(["nsIPrivacyTransitionObserver", "nsISupportsWeakReference"]),
-
-  privateModeChanged(enabled) {
-    gNotifications++;
+  QueryInterface: function(iid) {
+    if (Ci.nsIPrivacyTransitionObserver.equals(iid) ||
+        Ci.nsISupportsWeakReference.equals(iid) ||
+        Ci.nsISupports.equals(iid))
+      return this;
+    throw Cr.NS_ERROR_NO_INTERFACE;
   },
-};
+
+  privateModeChanged: function(enabled) {
+    gNotifications++;
+  }
+}
 
 function run_test() {
   let windowlessBrowser = Services.appShell.createWindowlessBrowser(false);
   windowlessBrowser.docShell.addWeakPrivacyTransitionObserver(observer);
-  windowlessBrowser.docShell.setOriginAttributes({privateBrowsingId: 1});
-  windowlessBrowser.docShell.setOriginAttributes({privateBrowsingId: 0});
+  windowlessBrowser.docShell.setOriginAttributes({privateBrowsingId : 1});
+  windowlessBrowser.docShell.setOriginAttributes({privateBrowsingId : 0});
   windowlessBrowser.close();
   Assert.equal(gNotifications, 2);
 }
diff --git a/docshell/test/unit_ipc/test_pb_notification_ipc.js b/docshell/test/unit_ipc/test_pb_notification_ipc.js
index 45d60f9b0e64..7c9af1b48ec6 100644
--- a/docshell/test/unit_ipc/test_pb_notification_ipc.js
+++ b/docshell/test/unit_ipc/test_pb_notification_ipc.js
@@ -1,18 +1,17 @@
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 function run_test() {
   var notifications = 0;
   var obs = {
-    observe(aSubject, aTopic, aData) {
+    observe: function(aSubject, aTopic, aData) {
       Assert.equal(aTopic, "last-pb-context-exited");
       notifications++;
-    },
+    }
   };
-  Services.os.addObserver(obs, "last-pb-context-exited");
-
+  var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+  os.addObserver(obs, "last-pb-context-exited");
+ 
   run_test_in_child("../unit/test_pb_notification.js",
                     function() {
                       Assert.equal(notifications, 1);
                       do_test_finished();
                     });
-}
+}
\ No newline at end of file