diff --git a/.eslintrc-test-paths.js b/.eslintrc-test-paths.js
index ed5fa1660bcf..2e4a1ec93977 100644
--- a/.eslintrc-test-paths.js
+++ b/.eslintrc-test-paths.js
@@ -114,7 +114,6 @@ const extraBrowserTestPaths = [
   "browser/base/content/test/siteIdentity/",
   "browser/base/content/test/startup/",
   "browser/base/content/test/static/",
-  "browser/base/content/test/statuspanel/",
   "browser/base/content/test/sync/",
   "browser/base/content/test/tabMediaIndicator/",
   "browser/base/content/test/tabPrompts/",
@@ -131,6 +130,7 @@ const extraBrowserTestPaths = [
   "browser/components/safebrowsing/content/test/",
   "browser/components/sessionstore/test/",
   "browser/components/shell/test/",
+  "browser/components/tabbrowser/test/statuspanel/",
   "browser/components/tabbrowser/test/tabs/",
   "browser/components/touchbar/tests/",
   "browser/components/uitour/test/",
diff --git a/browser/base/content/moz.build b/browser/base/content/moz.build
index 2a45e87dbefb..1f706d71f3a9 100644
--- a/browser/base/content/moz.build
+++ b/browser/base/content/moz.build
@@ -82,9 +82,6 @@ with Files("test/startup/**"):
 with Files("test/static/**"):
     BUG_COMPONENT = ("Firefox", "General")
 
-with Files("test/statuspanel/**"):
-    BUG_COMPONENT = ("Firefox", "Tabbed Browser")
-
 with Files("test/sync/**"):
     BUG_COMPONENT = ("Firefox", "Sync")
 
diff --git a/browser/base/moz.build b/browser/base/moz.build
index c316e0353aba..a740feec015f 100644
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -51,7 +51,6 @@ BROWSER_CHROME_MANIFESTS += [
     "content/test/siteIdentity/browser.toml",
     "content/test/startup/browser.toml",
     "content/test/static/browser.toml",
-    "content/test/statuspanel/browser.toml",
     "content/test/sync/browser.toml",
     "content/test/tabcrashed/browser.toml",
     "content/test/tabcrashed/browser_aboutRestartRequired.toml",
diff --git a/browser/components/tabbrowser/moz.build b/browser/components/tabbrowser/moz.build
index 0cde4eec54f3..3be9cfe1b2db 100644
--- a/browser/components/tabbrowser/moz.build
+++ b/browser/components/tabbrowser/moz.build
@@ -16,5 +16,6 @@ EXTRA_JS_MODULES += [
 ]
 
 BROWSER_CHROME_MANIFESTS += [
+    "test/statuspanel/browser.toml",
     "test/tabs/browser.toml",
 ]
diff --git a/browser/base/content/test/statuspanel/browser.toml b/browser/components/tabbrowser/test/statuspanel/browser.toml
similarity index 100%
rename from browser/base/content/test/statuspanel/browser.toml
rename to browser/components/tabbrowser/test/statuspanel/browser.toml
diff --git a/browser/base/content/test/statuspanel/browser_show_statuspanel_idn.js b/browser/components/tabbrowser/test/statuspanel/browser_show_statuspanel_idn.js
similarity index 100%
rename from browser/base/content/test/statuspanel/browser_show_statuspanel_idn.js
rename to browser/components/tabbrowser/test/statuspanel/browser_show_statuspanel_idn.js
diff --git a/browser/base/content/test/statuspanel/browser_show_statuspanel_twice.js b/browser/components/tabbrowser/test/statuspanel/browser_show_statuspanel_twice.js
similarity index 100%
rename from browser/base/content/test/statuspanel/browser_show_statuspanel_twice.js
rename to browser/components/tabbrowser/test/statuspanel/browser_show_statuspanel_twice.js
diff --git a/browser/base/content/test/statuspanel/head.js b/browser/components/tabbrowser/test/statuspanel/head.js
similarity index 100%
rename from browser/base/content/test/statuspanel/head.js
rename to browser/components/tabbrowser/test/statuspanel/head.js
diff --git a/testing/runtimes/manifest-runtimes-unix.json b/testing/runtimes/manifest-runtimes-unix.json
index 69bee72c7753..cb20fb7e33ac 100644
--- a/testing/runtimes/manifest-runtimes-unix.json
+++ b/testing/runtimes/manifest-runtimes-unix.json
@@ -140,7 +140,6 @@
     "browser/base/content/test/sidebar/browser.ini": 6.01,
     "browser/base/content/test/siteIdentity/browser.ini": 141.94,
     "browser/base/content/test/static/browser.ini": 24.4,
-    "browser/base/content/test/statuspanel/browser.ini": 2.47,
     "browser/base/content/test/sync/browser.ini": 7.27,
     "browser/base/content/test/tabPrompts/browser.ini": 3.85,
     "browser/base/content/test/tabcrashed/browser.ini": 19.5,
@@ -181,6 +180,7 @@
     "browser/components/shell/test/browser.ini": 4.41,
     "browser/components/ssb/tests/browser/browser.ini": 22.04,
     "browser/components/syncedtabs/test/browser/browser.ini": 1.8,
+    "browser/components/tabbrowser/test/statuspanel/browser.ini": 2.47,
     "browser/components/tabbrowser/test/tabs/browser.ini": 271.17,
     "browser/components/tests/browser/browser.ini": 4.78,
     "browser/components/tests/browser/whats_new_page/browser.ini": 0.71,
diff --git a/testing/runtimes/manifest-runtimes-windows.json b/testing/runtimes/manifest-runtimes-windows.json
index 679618b3e744..af5e1ced5940 100644
--- a/testing/runtimes/manifest-runtimes-windows.json
+++ b/testing/runtimes/manifest-runtimes-windows.json
@@ -138,7 +138,6 @@
     "browser/base/content/test/sidebar/browser.ini": 2.98,
     "browser/base/content/test/siteIdentity/browser.ini": 126.75,
     "browser/base/content/test/static/browser.ini": 27.06,
-    "browser/base/content/test/statuspanel/browser.ini": 1.51,
     "browser/base/content/test/sync/browser.ini": 5.17,
     "browser/base/content/test/tabPrompts/browser.ini": 2.4,
     "browser/base/content/test/tabcrashed/browser.ini": 38.67,
@@ -181,6 +180,7 @@
     "browser/components/shell/test/browser.ini": 0.8,
     "browser/components/ssb/tests/browser/browser.ini": 15.85,
     "browser/components/syncedtabs/test/browser/browser.ini": 0.76,
+    "browser/components/tabbrowser/test/statuspanel/browser.ini": 1.51,
     "browser/components/tabbrowser/test/tabs/browser.ini": 166.88,
     "browser/components/tests/browser/browser.ini": 2.15,
     "browser/components/tests/browser/whats_new_page/browser.ini": 0.63,