diff --git a/.eslintrc-rollouts.js b/.eslintrc-rollouts.js
index d5b848440dd1..572f620554a7 100644
--- a/.eslintrc-rollouts.js
+++ b/.eslintrc-rollouts.js
@@ -1494,7 +1494,6 @@ const rollouts = [
       "dom/tests/browser/browser_ConsoleStoragePBTest_perwindowpb.js",
       "dom/tests/browser/browser_beforeunload_between_chrome_content.js",
       "dom/tests/browser/browser_bug1004814.js",
-      "dom/tests/browser/browser_bug1238427.js",
       "dom/tests/browser/browser_bytecode_cache_asm_js.js",
       "dom/tests/browser/browser_frame_elements.js",
       "dom/tests/browser/browser_hasbeforeunload.js",
diff --git a/browser/components/resistfingerprinting/test/mochitest/mochitest.toml b/browser/components/resistfingerprinting/test/mochitest/mochitest.toml
index d24ea5f59752..534e82ac276f 100644
--- a/browser/components/resistfingerprinting/test/mochitest/mochitest.toml
+++ b/browser/components/resistfingerprinting/test/mochitest/mochitest.toml
@@ -6,7 +6,7 @@ support-files = [
   "file_animation_api.html",
   "worker_child.js",
   "worker_grandchild.js",
-  "!/dom/tests/mochitest/geolocation/network_geolocation.sjs",
+  "!/dom/geolocation/test/mochitest/network_geolocation.sjs",
 ]
 
 ["test_animation_api.html"]
diff --git a/browser/components/resistfingerprinting/test/mochitest/test_geolocation.html b/browser/components/resistfingerprinting/test/mochitest/test_geolocation.html
index 1c8828ee9abf..e80860655072 100644
--- a/browser/components/resistfingerprinting/test/mochitest/test_geolocation.html
+++ b/browser/components/resistfingerprinting/test/mochitest/test_geolocation.html
@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1372069
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript">
 
-  const BASE_GEO_URL = "http://mochi.test:8888/tests/dom/tests/mochitest/geolocation/network_geolocation.sjs";
+  const BASE_GEO_URL = "http://mochi.test:8888/tests/dom/geolocation/test/mochitest/network_geolocation.sjs";
 
   /** Test for Bug 1372069 */
   /** Modified for Bug 1441295 */
diff --git a/dom/geolocation/moz.build b/dom/geolocation/moz.build
index 4f9bf41b6734..61f354451e42 100644
--- a/dom/geolocation/moz.build
+++ b/dom/geolocation/moz.build
@@ -81,3 +81,8 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
     if CONFIG["MOZ_ENABLE_DBUS"]:
         LOCAL_INCLUDES += ["/dom/system/linux"]
         CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+
+BROWSER_CHROME_MANIFESTS += ["test/browser/browser.toml"]
+MOCHITEST_CHROME_MANIFESTS += ["test/chrome/chrome.toml"]
+MOCHITEST_MANIFESTS += ["test/mochitest/mochitest.toml"]
+XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.toml"]
diff --git a/dom/geolocation/test/browser/browser.toml b/dom/geolocation/test/browser/browser.toml
new file mode 100644
index 000000000000..b89809e87b03
--- /dev/null
+++ b/dom/geolocation/test/browser/browser.toml
@@ -0,0 +1,15 @@
+[DEFAULT]
+support-files = [
+  "!/dom/geolocation/test/mochitest/network_geolocation.sjs",
+]
+
+["browser_bug1008941_dismissGeolocationHanger.js"]
+support-files = ["position.html"]
+tags = "geolocation"
+
+["browser_bug1238427.js"]
+https_first_disabled = true
+support-files = ["geo_leak_test.html"]
+
+["browser_geolocation_override.js"]
+support-files = ["!/dom/tests/browser/file_empty.html"]
diff --git a/dom/tests/browser/browser_bug1008941_dismissGeolocationHanger.js b/dom/geolocation/test/browser/browser_bug1008941_dismissGeolocationHanger.js
similarity index 92%
rename from dom/tests/browser/browser_bug1008941_dismissGeolocationHanger.js
rename to dom/geolocation/test/browser/browser_bug1008941_dismissGeolocationHanger.js
index ae339e1d8dad..c7eba4a557b1 100644
--- a/dom/tests/browser/browser_bug1008941_dismissGeolocationHanger.js
+++ b/dom/geolocation/test/browser/browser_bug1008941_dismissGeolocationHanger.js
@@ -5,8 +5,7 @@
 "use strict";
 
 const TEST_URI =
-  // eslint-disable-next-line no-useless-concat
-  "https://example.com/" + "browser/dom/tests/browser/position.html";
+  "https://example.com/browser/dom/geolocation/test/browser/position.html";
 
 add_task(async function testDismissHanger() {
   info(
diff --git a/dom/tests/browser/browser_bug1238427.js b/dom/geolocation/test/browser/browser_bug1238427.js
similarity index 81%
rename from dom/tests/browser/browser_bug1238427.js
rename to dom/geolocation/test/browser/browser_bug1238427.js
index 6e599b7b56c9..8eacd3ca8dd2 100644
--- a/dom/tests/browser/browser_bug1238427.js
+++ b/dom/geolocation/test/browser/browser_bug1238427.js
@@ -6,11 +6,11 @@
 "use strict";
 
 const TEST_URI =
-  // eslint-disable-next-line no-useless-concat
-  "http://example.com/" + "browser/dom/tests/browser/geo_leak_test.html";
+  // eslint-disable-next-line @microsoft/sdl/no-insecure-url
+  "http://example.com/browser/dom/geolocation/test/browser/geo_leak_test.html";
 
 const BASE_GEO_URL =
-  "http://mochi.test:8888/tests/dom/tests/mochitest/geolocation/network_geolocation.sjs";
+  "http://mochi.test:8888/tests/dom/geolocation/test/mochitest/network_geolocation.sjs";
 
 add_task(async function () {
   Services.prefs.setBoolPref("geo.prompt.testing", true);
diff --git a/dom/tests/browser/browser_geolocation_override.js b/dom/geolocation/test/browser/browser_geolocation_override.js
similarity index 96%
rename from dom/tests/browser/browser_geolocation_override.js
rename to dom/geolocation/test/browser/browser_geolocation_override.js
index 4bfd8f5a247b..60e2b9dbe4b2 100644
--- a/dom/tests/browser/browser_geolocation_override.js
+++ b/dom/geolocation/test/browser/browser_geolocation_override.js
@@ -1,7 +1,8 @@
 const GEO_URL =
-  "http://mochi.test:8888/tests/dom/tests/mochitest/geolocation/network_geolocation.sjs";
+  "http://mochi.test:8888/tests/dom/geolocation/test/mochitest/network_geolocation.sjs";
 
-const PAGE_URL = "https://example.com/file_empty.html";
+const PAGE_URL =
+  "https://example.com/browser/dom/tests/browser/file_empty.html";
 
 const required_preferences = [
   ["geo.provider.network.url", GEO_URL],
@@ -18,10 +19,7 @@ add_task(async function test_getCurrentPosition() {
   const tab = await BrowserTestUtils.openNewForegroundTab(
     gBrowser,
     () => {
-      gBrowser.selectedTab = BrowserTestUtils.addTab(
-        gBrowser,
-        "https://example.com/file_empty.html"
-      );
+      gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, PAGE_URL);
       browser = gBrowser.selectedBrowser;
       pageLoaded = BrowserTestUtils.browserLoaded(browser, true);
     },
@@ -254,10 +252,7 @@ add_task(async function test_tab_reload() {
   const tab = await BrowserTestUtils.openNewForegroundTab(
     gBrowser,
     () => {
-      gBrowser.selectedTab = BrowserTestUtils.addTab(
-        gBrowser,
-        "https://example.com/file_empty.html"
-      );
+      gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, PAGE_URL);
       browser = gBrowser.selectedBrowser;
       pageLoaded = BrowserTestUtils.browserLoaded(browser, true);
     },
diff --git a/dom/tests/browser/geo_leak_test.html b/dom/geolocation/test/browser/geo_leak_test.html
similarity index 100%
rename from dom/tests/browser/geo_leak_test.html
rename to dom/geolocation/test/browser/geo_leak_test.html
diff --git a/dom/tests/browser/position.html b/dom/geolocation/test/browser/position.html
similarity index 100%
rename from dom/tests/browser/position.html
rename to dom/geolocation/test/browser/position.html
diff --git a/dom/tests/mochitest/geolocation/chrome.toml b/dom/geolocation/test/chrome/chrome.toml
similarity index 52%
rename from dom/tests/mochitest/geolocation/chrome.toml
rename to dom/geolocation/test/chrome/chrome.toml
index 12130b4d8bbe..e4c812272520 100644
--- a/dom/tests/mochitest/geolocation/chrome.toml
+++ b/dom/geolocation/test/chrome/chrome.toml
@@ -1,7 +1,7 @@
 [DEFAULT]
 support-files = [
-  "geolocation_common.js",
-  "network_geolocation.sjs",
+  "!/dom/geolocation/test/mochitest/geolocation_common.js",
+  "!/dom/geolocation/test/mochitest/network_geolocation.sjs",
 ]
 
 ["test_handlerSpinsEventLoop.html"]
diff --git a/dom/tests/mochitest/geolocation/test_handlerSpinsEventLoop.html b/dom/geolocation/test/chrome/test_handlerSpinsEventLoop.html
similarity index 86%
rename from dom/tests/mochitest/geolocation/test_handlerSpinsEventLoop.html
rename to dom/geolocation/test/chrome/test_handlerSpinsEventLoop.html
index 99ae586c4efc..14339368d866 100644
--- a/dom/tests/mochitest/geolocation/test_handlerSpinsEventLoop.html
+++ b/dom/geolocation/test/chrome/test_handlerSpinsEventLoop.html
@@ -6,19 +6,21 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=911595
 <head>
   <title>Test for spinning the event loop inside position handlers</title>
   <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="geolocation_common.js"></script>
+  <script src="https://example.com/tests/dom/geolocation/test/mochitest/geolocation_common.js"></script>
 
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
 </head>
 <body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=911595 ">Mozilla Bug 911595</a>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=911595">Mozilla Bug 911595</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
+/* global check_geolocation, force_prompt, resume_geolocationProvider */
+
 /*
  * In bug 911595 , spinning the event loop from inside position
  * handlers could cause both success and error callbacks to be
@@ -43,7 +45,7 @@ function successCallback(position) {
 }
 
 var errorCallbackCalled = false;
-function errorCallback(error) {
+function errorCallback(_error) {
   errorCallbackCalled = true;
   info("TEST-INFO | errorCallback called");
   check();
@@ -59,7 +61,7 @@ var timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
 function test1() {
   SpecialPowers.pushPrefEnv({"set": [["geo.provider.network.timeToWaitBeforeSending", 10]]}, function() {
     navigator.geolocation.getCurrentPosition(successCallback, errorCallback, {timeout: 500});
-    timer.initWithCallback(timer => {
+    timer.initWithCallback(_timer => {
       timeoutPassed = true;
     }, 600, Ci.nsITimer.TYPE_ONE_SHOT);
   });
diff --git a/dom/tests/mochitest/geolocation/crossorigin_iframe.html b/dom/geolocation/test/mochitest/crossorigin_iframe.html
similarity index 88%
rename from dom/tests/mochitest/geolocation/crossorigin_iframe.html
rename to dom/geolocation/test/mochitest/crossorigin_iframe.html
index f370003ad850..55f13b64294f 100644
--- a/dom/tests/mochitest/geolocation/crossorigin_iframe.html
+++ b/dom/geolocation/test/mochitest/crossorigin_iframe.html
@@ -7,7 +7,7 @@
   Runs inside iframe in test_crossorigin_iframe.html.
 */
 
-const BASE_GEO_URL = "http://mochi.test:8888/tests/dom/tests/mochitest/geolocation/network_geolocation.sjs";
+const BASE_GEO_URL = "http://mochi.test:8888/tests/dom/geolocation/test/mochitest/network_geolocation.sjs";
 var pushPrefs = (...p) => SpecialPowers.pushPrefEnv({set: p});
 
 (async () => {
diff --git a/dom/tests/mochitest/geolocation/file_featurePolicy.html b/dom/geolocation/test/mochitest/file_featurePolicy.html
similarity index 100%
rename from dom/tests/mochitest/geolocation/file_featurePolicy.html
rename to dom/geolocation/test/mochitest/file_featurePolicy.html
diff --git a/dom/tests/mochitest/geolocation/geolocation.html b/dom/geolocation/test/mochitest/geolocation.html
similarity index 100%
rename from dom/tests/mochitest/geolocation/geolocation.html
rename to dom/geolocation/test/mochitest/geolocation.html
diff --git a/dom/tests/mochitest/geolocation/geolocation_common.js b/dom/geolocation/test/mochitest/geolocation_common.js
similarity index 93%
rename from dom/tests/mochitest/geolocation/geolocation_common.js
rename to dom/geolocation/test/mochitest/geolocation_common.js
index 2868215e7699..f0f3b530d81c 100644
--- a/dom/tests/mochitest/geolocation/geolocation_common.js
+++ b/dom/geolocation/test/mochitest/geolocation_common.js
@@ -5,7 +5,7 @@ var harness =
 var BASE_URL =
   "http://mochi.test:8888/" +
   harness +
-  "/dom/tests/mochitest/geolocation/network_geolocation.sjs";
+  "/dom/geolocation/test/mochitest/network_geolocation.sjs";
 
 function set_geo_wifi_uri(uri, callback) {
   // Disable NetworkGeolocationProvider.js request cache because the cache
@@ -19,11 +19,6 @@ function set_geo_wifi_uri(uri, callback) {
   });
 }
 
-function sleep(delay) {
-  var start = Date.now();
-  while (Date.now() < start + delay) {}
-}
-
 function force_prompt(allow, callback) {
   SpecialPowers.pushPrefEnv(
     {
@@ -39,24 +34,27 @@ function force_prompt(allow, callback) {
 function start_sending_garbage(callback) {
   set_geo_wifi_uri(BASE_URL + "?action=respond-garbage", () => {
     // we need to be sure that all location data has been purged/set.
-    sleep(1000);
-    callback.call();
+    setTimeout(() => {
+      callback.call();
+    }, 1000);
   });
 }
 
 function stop_sending_garbage(callback) {
   set_geo_wifi_uri(BASE_URL + "", () => {
     // we need to be sure that all location data has been purged/set.
-    sleep(1000);
-    callback.call();
+    setTimeout(() => {
+      callback.call();
+    }, 1000);
   });
 }
 
 function stop_geolocationProvider(callback) {
   set_geo_wifi_uri(BASE_URL + "?action=stop-responding", () => {
     // we need to be sure that all location data has been purged/set.
-    sleep(1000);
-    callback.call();
+    setTimeout(() => {
+      callback.call();
+    }, 1000);
   });
 }
 
diff --git a/dom/tests/mochitest/geolocation/mochitest.toml b/dom/geolocation/test/mochitest/mochitest.toml
similarity index 100%
rename from dom/tests/mochitest/geolocation/mochitest.toml
rename to dom/geolocation/test/mochitest/mochitest.toml
diff --git a/dom/tests/mochitest/geolocation/network_geolocation.sjs b/dom/geolocation/test/mochitest/network_geolocation.sjs
similarity index 95%
rename from dom/tests/mochitest/geolocation/network_geolocation.sjs
rename to dom/geolocation/test/mochitest/network_geolocation.sjs
index 4074e57c1cb9..de57e3f46908 100644
--- a/dom/tests/mochitest/geolocation/network_geolocation.sjs
+++ b/dom/geolocation/test/mochitest/network_geolocation.sjs
@@ -9,7 +9,7 @@ function parseQueryString(str) {
   for (var i = 0, sz = paramArray.length; i < sz; i++) {
     var match = regex.exec(paramArray[i]);
     if (!match) {
-      throw "Bad parameter in queryString!  '" + paramArray[i] + "'";
+      throw new Error(`Bad parameter in queryString!  '${paramArray[i]}'`);
     }
     params[decodeURIComponent(match[1])] = decodeURIComponent(match[2]);
   }
@@ -53,7 +53,6 @@ function handleRequest(request, response) {
     }
   }
 
-  var response;
   response.processAsync();
   response.setStatusLine("1.0", 200, "OK");
   response.setHeader("Cache-Control", "no-cache", false);
diff --git a/dom/tests/mochitest/geolocation/popup.html b/dom/geolocation/test/mochitest/popup.html
similarity index 100%
rename from dom/tests/mochitest/geolocation/popup.html
rename to dom/geolocation/test/mochitest/popup.html
diff --git a/dom/tests/mochitest/geolocation/test_allowCurrent.html b/dom/geolocation/test/mochitest/test_allowCurrent.html
similarity index 99%
rename from dom/tests/mochitest/geolocation/test_allowCurrent.html
rename to dom/geolocation/test/mochitest/test_allowCurrent.html
index a0ebefdc60b3..4b8521fa6cc1 100644
--- a/dom/tests/mochitest/geolocation/test_allowCurrent.html
+++ b/dom/geolocation/test/mochitest/test_allowCurrent.html
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478911
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=478911">Mozilla Bug 478911</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -38,4 +38,3 @@ function test1() {
 </pre>
 </body>
 </html>
-
diff --git a/dom/tests/mochitest/geolocation/test_allowWatch.html b/dom/geolocation/test/mochitest/test_allowWatch.html
similarity index 99%
rename from dom/tests/mochitest/geolocation/test_allowWatch.html
rename to dom/geolocation/test/mochitest/test_allowWatch.html
index 782d5ee07125..b0eb33d74b34 100644
--- a/dom/tests/mochitest/geolocation/test_allowWatch.html
+++ b/dom/geolocation/test/mochitest/test_allowWatch.html
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478911
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=478911">Mozilla Bug 478911</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -41,4 +41,3 @@ function test1() {
 </pre>
 </body>
 </html>
-
diff --git a/dom/tests/mochitest/geolocation/test_cachedPosition.html b/dom/geolocation/test/mochitest/test_cachedPosition.html
similarity index 79%
rename from dom/tests/mochitest/geolocation/test_cachedPosition.html
rename to dom/geolocation/test/mochitest/test_cachedPosition.html
index 1422c3c3bbf2..312dbd19363c 100644
--- a/dom/tests/mochitest/geolocation/test_cachedPosition.html
+++ b/dom/geolocation/test/mochitest/test_cachedPosition.html
@@ -49,7 +49,7 @@ function done() {
   });
 }
 
-function errorCallback(err) {
+function errorCallback(_err) {
   ok(false, "error callback should not have been called");
   done();
 }
@@ -60,17 +60,17 @@ function test_cachedPosition() {
      // first call is just to warm up the cache
      check_geolocation(pos);
 
-     navigator.geolocation.getCurrentPosition(function(pos) {
-      check_geolocation(pos);
-      cached = pos;
+     navigator.geolocation.getCurrentPosition(function(pos2) {
+      check_geolocation(pos2);
+      cached = pos2;
 
-      navigator.geolocation.getCurrentPosition(function(pos) {
-        check_geolocation(pos);
-        is(pos.timestamp, cached.timestamp, "position should be equal to cached position");
-        navigator.geolocation.getCurrentPosition(function(pos) {
+      navigator.geolocation.getCurrentPosition(function(pos3) {
+        check_geolocation(pos3);
+        is(pos3.timestamp, cached.timestamp, "position should be equal to cached position");
+        navigator.geolocation.getCurrentPosition(function(pos4) {
           // force new position, can't be the one we have
-          check_geolocation(pos);
-          isnot(pos.timestamp, cached.timestamp, "position should not be equal to cached position");
+          check_geolocation(pos4);
+          isnot(pos4.timestamp, cached.timestamp, "position should not be equal to cached position");
           done();
         }, errorCallback, {maximumAge: 0});
       }, errorCallback, {maximumAge: 21600000});
diff --git a/dom/tests/mochitest/geolocation/test_cancelCurrent.html b/dom/geolocation/test/mochitest/test_cancelCurrent.html
similarity index 96%
rename from dom/tests/mochitest/geolocation/test_cancelCurrent.html
rename to dom/geolocation/test/mochitest/test_cancelCurrent.html
index a5357ac93878..90e459dabd32 100644
--- a/dom/tests/mochitest/geolocation/test_cancelCurrent.html
+++ b/dom/geolocation/test/mochitest/test_cancelCurrent.html
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478911
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=478911">Mozilla Bug 478911</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -30,7 +30,7 @@ function failureCallback(error) {
   SimpleTest.finish();
 }
 
-function successCallback(position){
+function successCallback(_position){
   ok(0, "Success was called when it shouldn't have been.  major problem");
   SimpleTest.finish();
 }
@@ -42,4 +42,3 @@ function test1() {
 </pre>
 </body>
 </html>
-
diff --git a/dom/tests/mochitest/geolocation/test_cancelWatch.html b/dom/geolocation/test/mochitest/test_cancelWatch.html
similarity index 96%
rename from dom/tests/mochitest/geolocation/test_cancelWatch.html
rename to dom/geolocation/test/mochitest/test_cancelWatch.html
index 18ca21ba18bb..ff225f8e9d44 100644
--- a/dom/tests/mochitest/geolocation/test_cancelWatch.html
+++ b/dom/geolocation/test/mochitest/test_cancelWatch.html
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478911
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=478911">Mozilla Bug 478911</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -32,7 +32,7 @@ function failureCallback(error) {
   SimpleTest.finish();
 }
 
-function successCallback(position){
+function successCallback(_position){
   ok(0, "Success was called when it shouldn't have been.  major problem");
   SimpleTest.finish();
 }
@@ -44,6 +44,3 @@ function test1() {
 </pre>
 </body>
 </html>
-
-
-
diff --git a/dom/tests/mochitest/geolocation/test_clearWatch.html b/dom/geolocation/test/mochitest/test_clearWatch.html
similarity index 96%
rename from dom/tests/mochitest/geolocation/test_clearWatch.html
rename to dom/geolocation/test/mochitest/test_clearWatch.html
index 4c1776331ef8..afc0417e65d4 100644
--- a/dom/tests/mochitest/geolocation/test_clearWatch.html
+++ b/dom/geolocation/test/mochitest/test_clearWatch.html
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478911
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=478911">Mozilla Bug 478911</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -30,7 +30,7 @@ var hasBeenCleared = false;
 var successWasCalledAfterClear = false;
 var firstCallback = true;
 
-function failureCallback(error)
+function failureCallback(_error)
 {
   ok(0, "we should not be seeing failures from this watchPosition");
 }
@@ -39,7 +39,7 @@ function successCallback(position) {
   ok(true, "successCallback was called, hasBeenCleared=" + hasBeenCleared +
            ", successWasCalledAfterClear=" + successWasCalledAfterClear);
   check_geolocation(position);
-  if (hasBeenCleared == true) {
+  if (hasBeenCleared) {
     successWasCalledAfterClear = true;
   }
   if (firstCallback) {
diff --git a/dom/tests/mochitest/geolocation/test_clearWatchBeforeAllowing.html b/dom/geolocation/test/mochitest/test_clearWatchBeforeAllowing.html
similarity index 92%
rename from dom/tests/mochitest/geolocation/test_clearWatchBeforeAllowing.html
rename to dom/geolocation/test/mochitest/test_clearWatchBeforeAllowing.html
index 3ac82232b7c7..7d6da0b59c7f 100644
--- a/dom/tests/mochitest/geolocation/test_clearWatchBeforeAllowing.html
+++ b/dom/geolocation/test/mochitest/test_clearWatchBeforeAllowing.html
@@ -34,7 +34,7 @@ function run_test() {
     function(pos) {
       check_geolocation(pos);
       successCallbackCalled = true;
-    }, function(err) {
+    }, function(_err) {
       errorCallbackCalled = true;
     }
   );
@@ -43,10 +43,10 @@ function run_test() {
     function(pos) {
       check_geolocation(pos);
       SimpleTest.executeSoon(function() {
-        ok(successCallbackCalled == false,
+        ok(!successCallbackCalled,
         "getCurrentPosition : Success callback should not have been called");
 
-        ok(errorCallbackCalled == false,
+        ok(!errorCallbackCalled,
         "getCurrentPosition : Error callback should not have been called");
 
         SimpleTest.finish();
diff --git a/dom/tests/mochitest/geolocation/test_clearWatch_invalid.html b/dom/geolocation/test/mochitest/test_clearWatch_invalid.html
similarity index 92%
rename from dom/tests/mochitest/geolocation/test_clearWatch_invalid.html
rename to dom/geolocation/test/mochitest/test_clearWatch_invalid.html
index fe2007481e5d..db9468bb6b37 100644
--- a/dom/tests/mochitest/geolocation/test_clearWatch_invalid.html
+++ b/dom/geolocation/test/mochitest/test_clearWatch_invalid.html
@@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=463039
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=463039">Mozilla Bug 463039</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -27,8 +27,8 @@ resume_geolocationProvider(function() {
 function test1() {
   navigator.geolocation.watchPosition(function(){});
 
-  // there are no watches, so this should always throw
-  for (x=-10; x<10; x++) {
+  // there are no watches, but this should never throw
+  for (let x=-10; x<10; x++) {
     navigator.geolocation.clearWatch(x);
     ok(1, "clearWatch should not throw");
   }
@@ -39,9 +39,8 @@ function test1() {
 
   SimpleTest.finish();
 }
-    
+
 </script>
 </pre>
 </body>
 </html>
-
diff --git a/dom/tests/mochitest/geolocation/test_crossorigin_iframe.html b/dom/geolocation/test/mochitest/test_crossorigin_iframe.html
similarity index 94%
rename from dom/tests/mochitest/geolocation/test_crossorigin_iframe.html
rename to dom/geolocation/test/mochitest/test_crossorigin_iframe.html
index 545ba518aee4..f29bb7dd8f73 100644
--- a/dom/tests/mochitest/geolocation/test_crossorigin_iframe.html
+++ b/dom/geolocation/test/mochitest/test_crossorigin_iframe.html
@@ -44,7 +44,7 @@ async function nextTest() {
 
   let geolocationPromise = checkGeolocationResult(test);
   iframe.src =
-    "https://example.net/tests/dom/tests/mochitest/geolocation/crossorigin_iframe.html";
+    "https://example.net/tests/dom/geolocation/test/mochitest/crossorigin_iframe.html";
   document.body.appendChild(iframe);
   await geolocationPromise;
 
diff --git a/dom/tests/mochitest/geolocation/test_enableHighAccuracy.html b/dom/geolocation/test/mochitest/test_enableHighAccuracy.html
similarity index 98%
rename from dom/tests/mochitest/geolocation/test_enableHighAccuracy.html
rename to dom/geolocation/test/mochitest/test_enableHighAccuracy.html
index f139c15d01f0..a3b4702c82ba 100644
--- a/dom/tests/mochitest/geolocation/test_enableHighAccuracy.html
+++ b/dom/geolocation/test/mochitest/test_enableHighAccuracy.html
@@ -11,6 +11,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1765835
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1765835">Mozilla Bug 1765835</a>
 <script class="testbody" type="text/javascript">
+/* global sendAsyncMessage, addMessageListener */
 function mockChromeScript() {
   function enableHighAccuracy(subject, topic, data) {
     sendAsyncMessage("setHighAccuracy", data == "true");
diff --git a/dom/tests/mochitest/geolocation/test_errorcheck.html b/dom/geolocation/test/mochitest/test_errorcheck.html
similarity index 97%
rename from dom/tests/mochitest/geolocation/test_errorcheck.html
rename to dom/geolocation/test/mochitest/test_errorcheck.html
index 7900aed1e2a0..78c3e15225b0 100644
--- a/dom/tests/mochitest/geolocation/test_errorcheck.html
+++ b/dom/geolocation/test/mochitest/test_errorcheck.html
@@ -38,7 +38,7 @@ function errorCallback(error) {
     SimpleTest.finish();
 }
 
-function successCallback(position) {
+function successCallback(_position) {
     test2();
 }
 
@@ -49,4 +49,3 @@ function test2() {
 </pre>
 </body>
 </html>
-
diff --git a/dom/tests/mochitest/geolocation/test_featurePolicy.html b/dom/geolocation/test/mochitest/test_featurePolicy.html
similarity index 100%
rename from dom/tests/mochitest/geolocation/test_featurePolicy.html
rename to dom/geolocation/test/mochitest/test_featurePolicy.html
diff --git a/dom/tests/mochitest/geolocation/test_garbageWatch.html b/dom/geolocation/test/mochitest/test_garbageWatch.html
similarity index 97%
rename from dom/tests/mochitest/geolocation/test_garbageWatch.html
rename to dom/geolocation/test/mochitest/test_garbageWatch.html
index 65e2fc8ac681..887ce3fc2e4c 100644
--- a/dom/tests/mochitest/geolocation/test_garbageWatch.html
+++ b/dom/geolocation/test/mochitest/test_garbageWatch.html
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=482260
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=455327">Mozilla Bug 482260</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -30,7 +30,7 @@ function test1() {
   start_sending_garbage(test2);
 }
 
-function successCallback(pos){
+function successCallback(_pos){
   ok(false, "success should have never been called.");
   stop_sending_garbage(function() {SimpleTest.finish();});
 }
diff --git a/dom/tests/mochitest/geolocation/test_geoGetCurrentPositionBlockedInInsecureContext.html b/dom/geolocation/test/mochitest/test_geoGetCurrentPositionBlockedInInsecureContext.html
similarity index 97%
rename from dom/tests/mochitest/geolocation/test_geoGetCurrentPositionBlockedInInsecureContext.html
rename to dom/geolocation/test/mochitest/test_geoGetCurrentPositionBlockedInInsecureContext.html
index 55435f6f1613..c74ee86673a5 100644
--- a/dom/tests/mochitest/geolocation/test_geoGetCurrentPositionBlockedInInsecureContext.html
+++ b/dom/geolocation/test/mochitest/test_geoGetCurrentPositionBlockedInInsecureContext.html
@@ -22,7 +22,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1269531
   // The test succeeds if the error callback is called because we expect
   // failure when a getCurrentPosition() request is submitted in a non
   // secure context.
-  function successCallback(position) {
+  function successCallback(_position) {
     ok(false, "Success callback is not expected to be called");
     SimpleTest.finish();
   }
@@ -44,4 +44,3 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1269531
   </pre>
 </body>
 </html>
-
diff --git a/dom/tests/mochitest/geolocation/test_geoWatchPositionBlockedInInsecureContext.html b/dom/geolocation/test/mochitest/test_geoWatchPositionBlockedInInsecureContext.html
similarity index 97%
rename from dom/tests/mochitest/geolocation/test_geoWatchPositionBlockedInInsecureContext.html
rename to dom/geolocation/test/mochitest/test_geoWatchPositionBlockedInInsecureContext.html
index 60bad9f644fe..bf344b3da794 100644
--- a/dom/tests/mochitest/geolocation/test_geoWatchPositionBlockedInInsecureContext.html
+++ b/dom/geolocation/test/mochitest/test_geoWatchPositionBlockedInInsecureContext.html
@@ -24,7 +24,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1269531
   // The test succeeds if the error callback is called because we expect
   // failure when a watchPosition() request is submitted in a non
   // secure context.
-  function successCallback(position) {
+  function successCallback(_position) {
     ok(false, "Success callback is not expected to be called");
     navigator.geolocation.clearWatch(wid);
     SimpleTest.finish();
@@ -48,4 +48,3 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1269531
   </pre>
 </body>
 </html>
-
diff --git a/dom/tests/mochitest/geolocation/test_geolocation_is_undefined_when_pref_is_off.html b/dom/geolocation/test/mochitest/test_geolocation_is_undefined_when_pref_is_off.html
similarity index 100%
rename from dom/tests/mochitest/geolocation/test_geolocation_is_undefined_when_pref_is_off.html
rename to dom/geolocation/test/mochitest/test_geolocation_is_undefined_when_pref_is_off.html
diff --git a/dom/tests/mochitest/geolocation/test_geolocation_is_undefined_when_pref_is_off_iframe.html b/dom/geolocation/test/mochitest/test_geolocation_is_undefined_when_pref_is_off_iframe.html
similarity index 100%
rename from dom/tests/mochitest/geolocation/test_geolocation_is_undefined_when_pref_is_off_iframe.html
rename to dom/geolocation/test/mochitest/test_geolocation_is_undefined_when_pref_is_off_iframe.html
diff --git a/dom/tests/mochitest/geolocation/test_hidden.html b/dom/geolocation/test/mochitest/test_hidden.html
similarity index 96%
rename from dom/tests/mochitest/geolocation/test_hidden.html
rename to dom/geolocation/test/mochitest/test_hidden.html
index 25f7f80d43e6..0d935eb9897b 100644
--- a/dom/tests/mochitest/geolocation/test_hidden.html
+++ b/dom/geolocation/test/mochitest/test_hidden.html
@@ -17,6 +17,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1653549
 
 <script class="testbody">
 SimpleTest.waitForExplicitFinish();
+SimpleTest.requestFlakyTimeout("we need to be sure that all location data has been purged/set");
 
 // Little promise wrapper helper.
 function p(f) {
@@ -107,4 +108,3 @@ resume_geolocationProvider(async () => {
 </pre>
 </body>
 </html>
-
diff --git a/dom/tests/mochitest/geolocation/test_manyCurrentConcurrent.html b/dom/geolocation/test/mochitest/test_manyCurrentConcurrent.html
similarity index 97%
rename from dom/tests/mochitest/geolocation/test_manyCurrentConcurrent.html
rename to dom/geolocation/test/mochitest/test_manyCurrentConcurrent.html
index b70bf096334c..c9190ffa5078 100644
--- a/dom/tests/mochitest/geolocation/test_manyCurrentConcurrent.html
+++ b/dom/geolocation/test/mochitest/test_manyCurrentConcurrent.html
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=482260
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=482260">Mozilla Bug 482260</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -36,7 +36,7 @@ function successCallback(position) {
   testPassed();
 }
 
-function failureCallback(code) {
+function failureCallback(_code) {
   failureCallbackCalled++;
   testPassed();
 }
@@ -57,4 +57,3 @@ function testPassed() {
 </pre>
 </body>
 </html>
-
diff --git a/dom/tests/mochitest/geolocation/test_manyCurrentSerial.html b/dom/geolocation/test/mochitest/test_manyCurrentSerial.html
similarity index 95%
rename from dom/tests/mochitest/geolocation/test_manyCurrentSerial.html
rename to dom/geolocation/test/mochitest/test_manyCurrentSerial.html
index 9afb62e52e3e..8076f93436d5 100644
--- a/dom/tests/mochitest/geolocation/test_manyCurrentSerial.html
+++ b/dom/geolocation/test/mochitest/test_manyCurrentSerial.html
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=482260
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=482260">Mozilla Bug 482260</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -27,10 +27,10 @@ resume_geolocationProvider(function() {
 
 var keepGoing = 10;
 
-function successCallback(position) {
+function successCallback(_position) {
   if (keepGoing-- > 0) {
     setTimeout(function() {navigator.geolocation.getCurrentPosition(successCallback);}, 0);
-    return; 
+    return;
   }
 
   ok(1, "100 successful calls");
@@ -44,4 +44,3 @@ function test1() {
 </pre>
 </body>
 </html>
-
diff --git a/dom/tests/mochitest/geolocation/test_manyWatchConcurrent.html b/dom/geolocation/test/mochitest/test_manyWatchConcurrent.html
similarity index 98%
rename from dom/tests/mochitest/geolocation/test_manyWatchConcurrent.html
rename to dom/geolocation/test/mochitest/test_manyWatchConcurrent.html
index 8d22e442cbea..2260772bcbbc 100644
--- a/dom/tests/mochitest/geolocation/test_manyWatchConcurrent.html
+++ b/dom/geolocation/test/mochitest/test_manyWatchConcurrent.html
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=482260
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=482260">Mozilla Bug 482260</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -38,7 +38,7 @@ function test1() {
         successCallbackCalled++;
         watchCallback(watchID);
       },
-      error => {
+      _error => {
         failureCallbackCalled++;
         watchCallback(watchID);
       }
diff --git a/dom/tests/mochitest/geolocation/test_manyWatchSerial.html b/dom/geolocation/test/mochitest/test_manyWatchSerial.html
similarity index 99%
rename from dom/tests/mochitest/geolocation/test_manyWatchSerial.html
rename to dom/geolocation/test/mochitest/test_manyWatchSerial.html
index bb27651d5636..46d58cce73db 100644
--- a/dom/tests/mochitest/geolocation/test_manyWatchSerial.html
+++ b/dom/geolocation/test/mochitest/test_manyWatchSerial.html
@@ -53,4 +53,3 @@ function test1() {
 </pre>
 </body>
 </html>
-
diff --git a/dom/tests/mochitest/geolocation/test_manyWindows.html b/dom/geolocation/test/mochitest/test_manyWindows.html
similarity index 99%
rename from dom/tests/mochitest/geolocation/test_manyWindows.html
rename to dom/geolocation/test/mochitest/test_manyWindows.html
index 5e6e74c61fb7..3cd9fa4eb935 100644
--- a/dom/tests/mochitest/geolocation/test_manyWindows.html
+++ b/dom/geolocation/test/mochitest/test_manyWindows.html
@@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478911
 href="https://bugzilla.mozilla.org/show_bug.cgi?id=478911">Crash in Multiple Windows</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
diff --git a/dom/tests/mochitest/geolocation/test_native_provider.html b/dom/geolocation/test/mochitest/test_native_provider.html
similarity index 97%
rename from dom/tests/mochitest/geolocation/test_native_provider.html
rename to dom/geolocation/test/mochitest/test_native_provider.html
index e0c26c611ab3..581228ed9b81 100644
--- a/dom/tests/mochitest/geolocation/test_native_provider.html
+++ b/dom/geolocation/test/mochitest/test_native_provider.html
@@ -57,7 +57,7 @@ add_task(async function test_highAccuracy() {
     { enableHighAccuracy: true});
   });
 
-  // Low accuracy can sometimes be the same as high accuracy 
+  // Low accuracy can sometimes be the same as high accuracy
   // if a location provider recently provided a value
   if(highAccuracy >= lowAccuracy ){
     ok(true, "accuracy is correct");
diff --git a/dom/tests/mochitest/geolocation/test_not_fully_active.html b/dom/geolocation/test/mochitest/test_not_fully_active.html
similarity index 97%
rename from dom/tests/mochitest/geolocation/test_not_fully_active.html
rename to dom/geolocation/test/mochitest/test_not_fully_active.html
index 6fc7689c8c83..199aa0bd8e79 100644
--- a/dom/tests/mochitest/geolocation/test_not_fully_active.html
+++ b/dom/geolocation/test/mochitest/test_not_fully_active.html
@@ -10,6 +10,7 @@
   </head>
   <body>
     <script>
+      /* global GeolocationPositionError */
       SimpleTest.waitForExplicitFinish();
 
       async function runTest() {
@@ -44,7 +45,7 @@
 
         // Now try to get current position while not fully active...
         const positionError = await new Promise((resolve, reject) => {
-          const result = geo.getCurrentPosition(
+          geo.getCurrentPosition(
             reject, // We don't want a position
             resolve // We want an error!
           );
diff --git a/dom/tests/mochitest/geolocation/test_optional_api_params.html b/dom/geolocation/test/mochitest/test_optional_api_params.html
similarity index 99%
rename from dom/tests/mochitest/geolocation/test_optional_api_params.html
rename to dom/geolocation/test/mochitest/test_optional_api_params.html
index 4aeb488a6461..3fdb6b4989ac 100644
--- a/dom/tests/mochitest/geolocation/test_optional_api_params.html
+++ b/dom/geolocation/test/mochitest/test_optional_api_params.html
@@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=452566
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=452566">Mozilla Bug 452566</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
diff --git a/dom/tests/mochitest/geolocation/test_shutdown.html b/dom/geolocation/test/mochitest/test_shutdown.html
similarity index 99%
rename from dom/tests/mochitest/geolocation/test_shutdown.html
rename to dom/geolocation/test/mochitest/test_shutdown.html
index 4b9133ef9d80..9de4ff798863 100644
--- a/dom/tests/mochitest/geolocation/test_shutdown.html
+++ b/dom/geolocation/test/mochitest/test_shutdown.html
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=716127
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=716127">Mozilla Bug 716127</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -60,4 +60,3 @@ function handle_error() {
 </pre>
 </body>
 </html>
-
diff --git a/dom/tests/mochitest/geolocation/test_timeoutCurrent.html b/dom/geolocation/test/mochitest/test_timeoutCurrent.html
similarity index 97%
rename from dom/tests/mochitest/geolocation/test_timeoutCurrent.html
rename to dom/geolocation/test/mochitest/test_timeoutCurrent.html
index 283f26b1fe82..ae7c4a113f2b 100644
--- a/dom/tests/mochitest/geolocation/test_timeoutCurrent.html
+++ b/dom/geolocation/test/mochitest/test_timeoutCurrent.html
@@ -26,7 +26,7 @@ resume_geolocationProvider(function() {
 });
 
 
-function successCallback(position) {
+function successCallback(_position) {
   ok(false, "we should not be seeing successCallback here.");
   SimpleTest.finish();
 }
@@ -53,4 +53,3 @@ function test1() {
 </pre>
 </body>
 </html>
-
diff --git a/dom/tests/mochitest/geolocation/test_timeoutWatch.html b/dom/geolocation/test/mochitest/test_timeoutWatch.html
similarity index 97%
rename from dom/tests/mochitest/geolocation/test_timeoutWatch.html
rename to dom/geolocation/test/mochitest/test_timeoutWatch.html
index 324886a4e751..cd531a8ea051 100644
--- a/dom/tests/mochitest/geolocation/test_timeoutWatch.html
+++ b/dom/geolocation/test/mochitest/test_timeoutWatch.html
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=455327
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=455327">Mozilla Bug 478911</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -31,7 +31,7 @@ function test1() {
   stop_geolocationProvider(test2);
 }
 
-function successCallback(pos){
+function successCallback(_pos){
   ok(false, "success should have never been called.");
   resume_geolocationProvider(function() {
     SimpleTest.finish();
diff --git a/dom/tests/mochitest/geolocation/test_windowClose.html b/dom/geolocation/test/mochitest/test_windowClose.html
similarity index 99%
rename from dom/tests/mochitest/geolocation/test_windowClose.html
rename to dom/geolocation/test/mochitest/test_windowClose.html
index 4ff858e8bba5..bc724afbe15c 100644
--- a/dom/tests/mochitest/geolocation/test_windowClose.html
+++ b/dom/geolocation/test/mochitest/test_windowClose.html
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=493615
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=493615">Mozilla Bug 493615</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -33,4 +33,3 @@ force_prompt(true, function() {
 </pre>
 </body>
 </html>
-
diff --git a/dom/tests/mochitest/geolocation/test_worseAccuracyDoesNotBlockCallback.html b/dom/geolocation/test/mochitest/test_worseAccuracyDoesNotBlockCallback.html
similarity index 100%
rename from dom/tests/mochitest/geolocation/test_worseAccuracyDoesNotBlockCallback.html
rename to dom/geolocation/test/mochitest/test_worseAccuracyDoesNotBlockCallback.html
diff --git a/dom/tests/mochitest/geolocation/windowTest.html b/dom/geolocation/test/mochitest/windowTest.html
similarity index 99%
rename from dom/tests/mochitest/geolocation/windowTest.html
rename to dom/geolocation/test/mochitest/windowTest.html
index 0366ffbe1ed2..769fb8d299fd 100644
--- a/dom/tests/mochitest/geolocation/windowTest.html
+++ b/dom/geolocation/test/mochitest/windowTest.html
@@ -41,4 +41,3 @@ navigator.geolocation.watchPosition(successCallback, null, null);
 </pre>
 </body>
 </html>
-
diff --git a/dom/tests/unit/test_geolocation_monitor.js b/dom/geolocation/test/unit/test_geolocation_monitor.js
similarity index 100%
rename from dom/tests/unit/test_geolocation_monitor.js
rename to dom/geolocation/test/unit/test_geolocation_monitor.js
diff --git a/dom/tests/unit/test_geolocation_position_unavailable.js b/dom/geolocation/test/unit/test_geolocation_position_unavailable.js
similarity index 100%
rename from dom/tests/unit/test_geolocation_position_unavailable.js
rename to dom/geolocation/test/unit/test_geolocation_position_unavailable.js
diff --git a/dom/tests/unit/test_geolocation_position_unavailable_wrap.js b/dom/geolocation/test/unit/test_geolocation_position_unavailable_wrap.js
similarity index 100%
rename from dom/tests/unit/test_geolocation_position_unavailable_wrap.js
rename to dom/geolocation/test/unit/test_geolocation_position_unavailable_wrap.js
diff --git a/dom/tests/unit/test_geolocation_provider.js b/dom/geolocation/test/unit/test_geolocation_provider.js
similarity index 100%
rename from dom/tests/unit/test_geolocation_provider.js
rename to dom/geolocation/test/unit/test_geolocation_provider.js
diff --git a/dom/tests/unit/test_geolocation_provider_timeout.js b/dom/geolocation/test/unit/test_geolocation_provider_timeout.js
similarity index 100%
rename from dom/tests/unit/test_geolocation_provider_timeout.js
rename to dom/geolocation/test/unit/test_geolocation_provider_timeout.js
diff --git a/dom/tests/unit/test_geolocation_reset_accuracy.js b/dom/geolocation/test/unit/test_geolocation_reset_accuracy.js
similarity index 100%
rename from dom/tests/unit/test_geolocation_reset_accuracy.js
rename to dom/geolocation/test/unit/test_geolocation_reset_accuracy.js
diff --git a/dom/tests/unit/test_geolocation_reset_accuracy_wrap.js b/dom/geolocation/test/unit/test_geolocation_reset_accuracy_wrap.js
similarity index 100%
rename from dom/tests/unit/test_geolocation_reset_accuracy_wrap.js
rename to dom/geolocation/test/unit/test_geolocation_reset_accuracy_wrap.js
diff --git a/dom/tests/unit/test_geolocation_timeout.js b/dom/geolocation/test/unit/test_geolocation_timeout.js
similarity index 100%
rename from dom/tests/unit/test_geolocation_timeout.js
rename to dom/geolocation/test/unit/test_geolocation_timeout.js
diff --git a/dom/tests/unit/test_geolocation_timeout_wrap.js b/dom/geolocation/test/unit/test_geolocation_timeout_wrap.js
similarity index 100%
rename from dom/tests/unit/test_geolocation_timeout_wrap.js
rename to dom/geolocation/test/unit/test_geolocation_timeout_wrap.js
diff --git a/dom/geolocation/test/unit/xpcshell.toml b/dom/geolocation/test/unit/xpcshell.toml
new file mode 100644
index 000000000000..cd5160b5bcb4
--- /dev/null
+++ b/dom/geolocation/test/unit/xpcshell.toml
@@ -0,0 +1,25 @@
+[DEFAULT]
+
+["test_geolocation_monitor.js"]
+
+["test_geolocation_position_unavailable.js"]
+
+["test_geolocation_position_unavailable_wrap.js"]
+
+["test_geolocation_provider.js"]
+
+["test_geolocation_provider_timeout.js"]
+
+["test_geolocation_reset_accuracy.js"]
+skip-if = [
+  "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && opt && msix", # Bug 1822179
+]
+
+["test_geolocation_reset_accuracy_wrap.js"]
+skip-if = [
+  "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && opt && msix", # Bug 1822179
+]
+
+["test_geolocation_timeout.js"]
+
+["test_geolocation_timeout_wrap.js"]
diff --git a/dom/security/featurepolicy/test/browser/browser.toml b/dom/security/featurepolicy/test/browser/browser.toml
index d806bd68beab..79c05fbb01b0 100644
--- a/dom/security/featurepolicy/test/browser/browser.toml
+++ b/dom/security/featurepolicy/test/browser/browser.toml
@@ -1,7 +1,7 @@
 [DEFAULT]
 support-files = [
   "empty.html",
-  "!/dom/tests/mochitest/geolocation/network_geolocation.sjs",
+  "!/dom/geolocation/test/mochitest/network_geolocation.sjs",
 ]
 tags = "feature-policy"
 
diff --git a/dom/security/featurepolicy/test/browser/browser_cross_origin_embed.js b/dom/security/featurepolicy/test/browser/browser_cross_origin_embed.js
index d119e919971e..341c60968271 100644
--- a/dom/security/featurepolicy/test/browser/browser_cross_origin_embed.js
+++ b/dom/security/featurepolicy/test/browser/browser_cross_origin_embed.js
@@ -10,7 +10,7 @@ const TEST_PATH_ORG = getRootDirectory(gTestPath).replace(
 );
 
 const GEO_URL =
-  "http://mochi.test:8888/tests/dom/tests/mochitest/geolocation/network_geolocation.sjs";
+  "http://mochi.test:8888/tests/dom/geolocation/test/mochitest/network_geolocation.sjs";
 
 add_task(async () => {
   await SpecialPowers.pushPrefEnv({
diff --git a/dom/tests/browser/browser.toml b/dom/tests/browser/browser.toml
index e521f7f4a61a..53c1511c8187 100644
--- a/dom/tests/browser/browser.toml
+++ b/dom/tests/browser/browser.toml
@@ -7,15 +7,12 @@ support-files = [
   "page_localstorage_coop+coep.html",
   "page_localstorage_coop+coep.html^headers^",
   "page_localstorage_snapshotting.html",
-  "position.html",
   "test-console-api.html",
   "test_bug1004814.html",
   "worker_bug1004814.js",
-  "geo_leak_test.html",
   "dummy.html",
   "dummy.png",
   "helper_localStorage.js",
-  "!/dom/tests/mochitest/geolocation/network_geolocation.sjs",
 ]
 
 ["browser_ConsoleAPI_originAttributes.js"]
@@ -37,15 +34,9 @@ https_first_disabled = true
 
 ["browser_bug1004814.js"]
 
-["browser_bug1008941_dismissGeolocationHanger.js"]
-tags = "geolocation"
-
 ["browser_bug1236512.js"]
 skip-if = ["os == 'linux' && os_version == '18.04' && processor == 'x86_64'"]
 
-["browser_bug1238427.js"]
-https_first_disabled = true
-
 ["browser_bug1316330.js"]
 
 ["browser_bug1563629.js"]
@@ -80,9 +71,6 @@ support-files = ["file_empty.html"]
 
 ["browser_frame_elements.js"]
 
-["browser_geolocation_override.js"]
-support-files = ["file_empty.html"]
-
 ["browser_hasActivePeerConnections.js"]
 support-files = ["create_webrtc_peer_connection.html"]
 skip-if = [
diff --git a/dom/tests/mochitest/chrome/chrome.toml b/dom/tests/mochitest/chrome/chrome.toml
index 0d284190ece1..daeaf51ed007 100644
--- a/dom/tests/mochitest/chrome/chrome.toml
+++ b/dom/tests/mochitest/chrome/chrome.toml
@@ -32,7 +32,6 @@ support-files = [
   "!/dom/tests/mochitest/general/file_clonewrapper.html",
   "!/dom/tests/mochitest/general/file_moving_nodeList.html",
   "!/dom/tests/mochitest/general/file_moving_xhr.html",
-  "!/dom/tests/mochitest/geolocation/network_geolocation.sjs",
 ]
 prefs = [ "layout.css.at-scope.enabled=true" ]
 
diff --git a/dom/tests/moz.build b/dom/tests/moz.build
index 49ac92ef9a82..fe74249fe0e9 100644
--- a/dom/tests/moz.build
+++ b/dom/tests/moz.build
@@ -16,15 +16,6 @@ with Files("browser/*autofocus*"):
 with Files("browser/*unload*"):
     BUG_COMPONENT = ("Core", "DOM: Events")
 
-with Files("browser/*1238427*"):
-    BUG_COMPONENT = ("Core", "DOM: Geolocation")
-
-with Files("browser/*Geolocation*"):
-    BUG_COMPONENT = ("Core", "DOM: Geolocation")
-
-with Files("browser/*geo_*"):
-    BUG_COMPONENT = ("Core", "DOM: Geolocation")
-
 with Files("browser/browser_cancel_keydown_keypress_event.js"):
     BUG_COMPONENT = ("Core", "DOM: UI Events & Focus Handling")
 
@@ -76,9 +67,6 @@ with Files("mochitest/gamepad/**"):
 with Files("mochitest/general/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
-with Files("mochitest/geolocation/**"):
-    BUG_COMPONENT = ("Core", "DOM: Geolocation")
-
 with Files("mochitest/localstorage/**"):
     BUG_COMPONENT = ("Core", "Storage: localStorage & sessionStorage")
 
@@ -136,9 +124,6 @@ with Files("reftest/xml-stylesheet/**"):
 with Files("unit/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
-with Files("unit/*geolocation*"):
-    BUG_COMPONENT = ("Core", "DOM: Geolocation")
-
 with Files("unit/test_bug465752.js"):
     BUG_COMPONENT = ("Core", "CSS Parsing and Computation")
 
@@ -160,7 +145,6 @@ MOCHITEST_MANIFESTS += [
     "mochitest/fetch/mochitest.toml",
     "mochitest/gamepad/mochitest.toml",
     "mochitest/general/mochitest.toml",
-    "mochitest/geolocation/mochitest.toml",
     "mochitest/integer-gemm/mochitest.toml",
     "mochitest/keyhandling/mochitest.toml",
     "mochitest/localstorage/mochitest.toml",
@@ -178,7 +162,6 @@ MOCHITEST_CHROME_MANIFESTS += [
     "mochitest/chrome/chrome.toml",
     "mochitest/fs/chrome.toml",
     "mochitest/general/chrome.toml",
-    "mochitest/geolocation/chrome.toml",
     "mochitest/keyhandling/chrome.toml",
     "mochitest/localstorage/chrome.toml",
     "mochitest/sessionstorage/chrome.toml",
diff --git a/dom/tests/unit/xpcshell.toml b/dom/tests/unit/xpcshell.toml
index 357c234ca4f0..810b71b96204 100644
--- a/dom/tests/unit/xpcshell.toml
+++ b/dom/tests/unit/xpcshell.toml
@@ -8,28 +8,4 @@
 
 ["test_bug465752.js"]
 
-["test_geolocation_monitor.js"]
-
-["test_geolocation_position_unavailable.js"]
-
-["test_geolocation_position_unavailable_wrap.js"]
-
-["test_geolocation_provider.js"]
-
-["test_geolocation_provider_timeout.js"]
-
-["test_geolocation_reset_accuracy.js"]
-skip-if = [
-  "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && opt && msix", # Bug 1822179
-]
-
-["test_geolocation_reset_accuracy_wrap.js"]
-skip-if = [
-  "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && opt && msix", # Bug 1822179
-]
-
-["test_geolocation_timeout.js"]
-
-["test_geolocation_timeout_wrap.js"]
-
 ["test_xhr_init.js"]
diff --git a/testing/profiles/unittest-required/user.js b/testing/profiles/unittest-required/user.js
index 33bdcdc6c864..46a2f3570061 100644
--- a/testing/profiles/unittest-required/user.js
+++ b/testing/profiles/unittest-required/user.js
@@ -122,7 +122,7 @@ user_pref("geo.provider.testing", true);
 user_pref("geo.provider.network.logging.enabled", true);
 user_pref("geo.provider.network.scan", false);
 user_pref("geo.provider.network.timeToWaitBeforeSending", 2000);
-user_pref("geo.provider.network.url", "http://{server}/tests/dom/tests/mochitest/geolocation/network_geolocation.sjs");
+user_pref("geo.provider.network.url", "http://{server}/tests/dom/geolocation/test/mochitest/network_geolocation.sjs");
 user_pref("gfx.color_management.force_srgb", true);
 user_pref("gfx.logging.level", 1);
 // We don't want to hit the real Firefox Accounts server for tests.  We don't
diff --git a/toolkit/components/extensions/test/mochitest/mochitest-common.toml b/toolkit/components/extensions/test/mochitest/mochitest-common.toml
index ff63eddb816b..26ccd3b945d1 100644
--- a/toolkit/components/extensions/test/mochitest/mochitest-common.toml
+++ b/toolkit/components/extensions/test/mochitest/mochitest-common.toml
@@ -73,7 +73,7 @@ support-files = [
   "serviceWorker.js",
   "slow_response.sjs",
   "webrequest_worker.js",
-  "!/dom/tests/mochitest/geolocation/network_geolocation.sjs",
+  "!/dom/geolocation/test/mochitest/network_geolocation.sjs",
   "!/toolkit/components/passwordmgr/test/authenticate.sjs",
   "file_redirect_data_uri.html",
   "file_redirect_cors_bypass.html",
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_geolocation.html b/toolkit/components/extensions/test/mochitest/test_ext_geolocation.html
index 9f326372bb69..0893775e6d6b 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_geolocation.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_geolocation.html
@@ -11,7 +11,7 @@
 "use strict";
 
 add_task(async function test_geolocation_nopermission() {
-  let GEO_URL = "http://mochi.test:8888/tests/dom/tests/mochitest/geolocation/network_geolocation.sjs";
+  let GEO_URL = "http://mochi.test:8888/tests/dom/geolocation/test/mochitest/network_geolocation.sjs";
   await SpecialPowers.pushPrefEnv({"set": [["geo.provider.network.url", GEO_URL]]});
 });