diff --git a/browser/base/content/test/urlbar/browser.ini b/browser/base/content/test/urlbar/browser.ini
index 84124f818351..86c753d19243 100644
--- a/browser/base/content/test/urlbar/browser.ini
+++ b/browser/base/content/test/urlbar/browser.ini
@@ -154,8 +154,6 @@ support-files =
   slow-page.sjs
 [browser_urlbar_remoteness_switch.js]
 run-if = e10s
-[browser_urlHighlight.js]
-[browser_urlOverflow.js]
 [browser_wyciwyg_urlbarCopying.js]
 subsuite = clipboard
 support-files =
diff --git a/browser/components/urlbar/tests/browser/browser.ini b/browser/components/urlbar/tests/browser/browser.ini
index c190486f4b55..be682492399c 100644
--- a/browser/components/urlbar/tests/browser/browser.ini
+++ b/browser/components/urlbar/tests/browser/browser.ini
@@ -7,8 +7,10 @@ support-files =
   head.js
 
 [browser_UrlbarController_resultOpening.js]
+[browser_UrlbarInput_formatValue.js]
+[browser_UrlbarInput_overflow.js]
 [browser_UrlbarInput_tooltip.js]
-[browser_UrlbarInput_unit.js]
-support-files = empty.xul
 [browser_UrlbarInput_trimURLs.js]
 subsuite = clipboard
+[browser_UrlbarInput_unit.js]
+support-files = empty.xul
diff --git a/browser/base/content/test/urlbar/browser_urlHighlight.js b/browser/components/urlbar/tests/browser/browser_UrlbarInput_formatValue.js
similarity index 100%
rename from browser/base/content/test/urlbar/browser_urlHighlight.js
rename to browser/components/urlbar/tests/browser/browser_UrlbarInput_formatValue.js
diff --git a/browser/base/content/test/urlbar/browser_urlOverflow.js b/browser/components/urlbar/tests/browser/browser_UrlbarInput_overflow.js
similarity index 100%
rename from browser/base/content/test/urlbar/browser_urlOverflow.js
rename to browser/components/urlbar/tests/browser/browser_UrlbarInput_overflow.js