--- a/toolkit/components/places/tests/browser/browser_notfound.js
+++ b/toolkit/components/places/tests/browser/browser_notfound.js
@@ -1,44 +1,46 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-function test() {
-  waitForExplicitFinish();
+add_task(function* () {
+  const TEST_URL = "http://mochi.test:8888/notFoundPage.html";
 
-  gBrowser.selectedTab = gBrowser.addTab();
-  registerCleanupFunction(function() {
-    gBrowser.removeCurrentTab();
-  });
-  const TEST_URL = "http://mochi.test:8888/notFoundPage.html";
   // Used to verify errors are not marked as typed.
   PlacesUtils.history.markPageAsTyped(NetUtil.newURI(TEST_URL));
-  gBrowser.selectedBrowser.loadURI(TEST_URL);
 
   // Create and add history observer.
-  let historyObserver = {
-    onVisit: function (aURI, aVisitID, aTime, aSessionID, aReferringID,
-                      aTransitionType) {
-      PlacesUtils.history.removeObserver(historyObserver);
-      info("Received onVisit: " + aURI.spec);
-      fieldForUrl(aURI, "frecency", function (aFrecency) {
-        is(aFrecency, 0, "Frecency should be 0");
-        fieldForUrl(aURI, "hidden", function (aHidden) {
-          is(aHidden, 0, "Page should not be hidden");
-          fieldForUrl(aURI, "typed", function (aTyped) {
-            is(aTyped, 0, "page should not be marked as typed");
-            PlacesTestUtils.clearHistory().then(finish);
+  let visitedPromise = new Promise(resolve => {
+    let historyObserver = {
+      onVisit: function (aURI, aVisitID, aTime, aSessionID, aReferringID,
+                        aTransitionType) {
+        PlacesUtils.history.removeObserver(historyObserver);
+        info("Received onVisit: " + aURI.spec);
+        fieldForUrl(aURI, "frecency", function (aFrecency) {
+          is(aFrecency, 0, "Frecency should be 0");
+          fieldForUrl(aURI, "hidden", function (aHidden) {
+            is(aHidden, 0, "Page should not be hidden");
+            fieldForUrl(aURI, "typed", function (aTyped) {
+              is(aTyped, 0, "page should not be marked as typed");
+              resolve();
+            });
           });
         });
-      });
-    },
-    onBeginUpdateBatch: function () {},
-    onEndUpdateBatch: function () {},
-    onTitleChanged: function () {},
-    onDeleteURI: function () {},
-    onClearHistory: function () {},
-    onPageChanged: function () {},
-    onDeleteVisits: function () {},
-    QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
-  };
-  PlacesUtils.history.addObserver(historyObserver, false);
-}
+      },
+      onBeginUpdateBatch: function () {},
+      onEndUpdateBatch: function () {},
+      onTitleChanged: function () {},
+      onDeleteURI: function () {},
+      onClearHistory: function () {},
+      onPageChanged: function () {},
+      onDeleteVisits: function () {},
+      QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
+    };
+    PlacesUtils.history.addObserver(historyObserver, false);
+  });
+
+  let newTabPromise = BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
+  yield Promise.all([visitedPromise, newTabPromise]);
+
+  yield PlacesTestUtils.clearHistory();
+  gBrowser.removeCurrentTab();
+});