--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -188,17 +188,16 @@ skip-if = true # bug 428712
 [browser_bug462289.js]
 skip-if = toolkit == "cocoa"
 [browser_bug462673.js]
 [browser_bug477014.js]
 [browser_bug479408.js]
 [browser_bug481560.js]
 [browser_bug484315.js]
 [browser_bug491431.js]
-[browser_bug495058.js]
 [browser_bug517902.js]
 skip-if = (os == 'linux' && e10s) # bug 1161699
 [browser_bug519216.js]
 [browser_bug520538.js]
 [browser_bug521216.js]
 [browser_bug533232.js]
 [browser_bug537013.js]
 subsuite = clipboard

deleted file mode 100644
--- a/browser/base/content/test/general/browser_bug495058.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Tests that the right elements of a tab are focused when it is
- * torn out into its own window.
- */
-
-const URIS = [
-  "about:blank",
-  "about:sessionrestore",
-  "about:privatebrowsing",
-];
-
-add_task(function*() {
-  for (let uri of URIS) {
-    let tab = gBrowser.addTab();
-    yield BrowserTestUtils.loadURI(tab.linkedBrowser, uri);
-
-    let win = gBrowser.replaceTabWithWindow(tab);
-    yield TestUtils.topicObserved("browser-delayed-startup-finished",
-                                  subject => subject == win);
-    tab = win.gBrowser.selectedTab;
-
-    // BrowserTestUtils doesn't get the add-on shims, which means that
-    // MozAfterPaint won't get shimmed over if we add an event handler
-    // for it in the parent.
-    if (tab.linkedBrowser.isRemoteBrowser) {
-      yield BrowserTestUtils.waitForContentEvent(tab.linkedBrowser, "MozAfterPaint");
-    } else {
-      yield BrowserTestUtils.waitForEvent(tab.linkedBrowser, "MozAfterPaint");
-    }
-
-    Assert.equal(win.gBrowser.currentURI.spec, uri, uri + ": uri loaded in detached tab");
-    Assert.equal(win.document.activeElement, win.gBrowser.selectedBrowser, uri + ": browser is focused");
-    Assert.equal(win.gURLBar.value, "", uri + ": urlbar is empty");
-    Assert.ok(win.gURLBar.placeholder, uri + ": placeholder text is present");
-
-    yield BrowserTestUtils.closeWindow(win);
-  }
-});

--- a/browser/base/content/test/urlbar/browser.ini
+++ b/browser/base/content/test/urlbar/browser.ini
@@ -21,16 +21,17 @@ support-files =
 [browser_autocomplete_tag_star_visibility.js]
 [browser_bug1104165-switchtab-decodeuri.js]
 [browser_bug1003461-switchtab-override.js]
 [browser_bug1024133-switchtab-override-keynav.js]
 [browser_bug1025195_switchToTabHavingURI_aOpenParams.js]
 [browser_bug1070778.js]
 [browser_bug1225194-remotetab.js]
 [browser_bug304198.js]
+[browser_bug495058.js]
 [browser_bug556061.js]
 subsuite = clipboard
 [browser_bug562649.js]
 [browser_bug623155.js]
 support-files =
   redirect_bug623155.sjs
 [browser_bug783614.js]
 [browser_canonizeURL.js]

new file mode 100644
--- /dev/null
+++ b/browser/base/content/test/urlbar/browser_bug495058.js
@@ -0,0 +1,39 @@
+/**
+ * Tests that the right elements of a tab are focused when it is
+ * torn out into its own window.
+ */
+
+const URIS = [
+  "about:blank",
+  "about:sessionrestore",
+  "about:privatebrowsing",
+];
+
+add_task(function*() {
+  for (let uri of URIS) {
+    let tab = gBrowser.addTab();
+    yield BrowserTestUtils.loadURI(tab.linkedBrowser, uri);
+
+    let win = gBrowser.replaceTabWithWindow(tab);
+
+    yield BrowserTestUtils.waitForEvent(tab.linkedBrowser, "EndSwapDocShells");
+
+    tab = win.gBrowser.selectedTab;
+
+    // BrowserTestUtils doesn't get the add-on shims, which means that
+    // MozAfterPaint won't get shimmed over if we add an event handler
+    // for it in the parent.
+    if (tab.linkedBrowser.isRemoteBrowser) {
+      yield BrowserTestUtils.waitForMessage(tab.linkedBrowser.messageManager, "Browser:FirstPaint");
+    } else {
+      yield BrowserTestUtils.waitForEvent(tab.linkedBrowser, "MozAfterPaint");
+    }
+
+    Assert.equal(win.gBrowser.currentURI.spec, uri, uri + ": uri loaded in detached tab");
+    Assert.equal(win.document.activeElement, win.gBrowser.selectedBrowser, uri + ": browser is focused");
+    Assert.equal(win.gURLBar.value, "", uri + ": urlbar is empty");
+    Assert.ok(win.gURLBar.placeholder, uri + ": placeholder text is present");
+
+    yield BrowserTestUtils.closeWindow(win);
+  }
+});