--- a/docshell/test/browser/browser_bug554155.js
+++ b/docshell/test/browser/browser_bug554155.js
@@ -1,31 +1,26 @@
-function test() {
-  waitForExplicitFinish();
-
-  let tab = gBrowser.addTab("http://example.com");
-
-  tab.linkedBrowser.addEventListener("load", function() {
+add_task(function* test() {
+  yield BrowserTestUtils.withNewTab({ gBrowser, url: "http://example.com" }, function* (browser) {
     let numLocationChanges = 0;
 
     let listener = {
       onLocationChange: function(browser, webProgress, request, uri, flags) {
         info("location change: " + (uri && uri.spec));
         numLocationChanges++;
       }
     };
 
     gBrowser.addTabsProgressListener(listener);
 
-    // pushState to a new URL (http://example.com/foo").  This should trigger
-    // exactly one LocationChange event.
-    tab.linkedBrowser.contentWindow.history.pushState(null, null, "foo");
-
-    executeSoon(function() {
-      gBrowser.removeTab(tab);
-      gBrowser.removeTabsProgressListener(listener);
-      is(numLocationChanges, 1,
-         "pushState should cause exactly one LocationChange event.");
-      finish();
+    yield ContentTask.spawn(browser, null, function() {
+      // pushState to a new URL (http://example.com/foo").  This should trigger
+      // exactly one LocationChange event.
+      content.history.pushState(null, null, "foo");
     });
 
-  }, {capture: true, once: true});
-}
+    yield Promise.resolve();
+
+    gBrowser.removeTabsProgressListener(listener);
+    is(numLocationChanges, 1,
+       "pushState should cause exactly one LocationChange event.");
+  });
+});