--- a/browser/components/sessionstore/test/browser_394759_behavior.js
+++ b/browser/components/sessionstore/test/browser_394759_behavior.js
@@ -21,20 +21,19 @@
  */
 function testWindows(windowsToOpen, expectedResults) {
   return Task.spawn(function*() {
     for (let winData of windowsToOpen) {
       let features = "chrome,dialog=no," +
                      (winData.isPopup ? "all=no" : "all");
       let url = "http://example.com/?window=" + windowsToOpen.length;
 
-      let openWindowPromise = BrowserTestUtils.waitForNewWindow();
+      let openWindowPromise = BrowserTestUtils.waitForNewWindow(true, url);
       openDialog(getBrowserURL(), "", features, url);
       let win = yield openWindowPromise;
-      yield BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
       yield BrowserTestUtils.closeWindow(win);
     }
 
     let closedWindowData = JSON.parse(ss.getClosedWindowData());
     let numPopups = closedWindowData.filter(function(el, i, arr) {
       return el.isPopup;
     }).length;
     let numNormal = ss.getClosedWindowCount() - numPopups;