--- a/toolkit/components/places/tests/chrome/browser_disableglobalhistory.xul
+++ b/toolkit/components/places/tests/chrome/browser_disableglobalhistory.xul
@@ -1,17 +1,16 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
 
 <window title="Test disableglobalhistory attribute on remote browsers"
+        onload="run_test()"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/AddTask.js"></script>
 
   <browser id="inprocess_disabled" src="about:blank" type="content" disableglobalhistory="true" />
   <browser id="inprocess_enabled" src="about:blank" type="content" />
 
   <browser id="remote_disabled" src="about:blank" type="content" disableglobalhistory="true" />
   <browser id="remote_enabled" src="about:blank" type="content" />
 
   <script type="text/javascript">
@@ -22,20 +21,20 @@
   function expectUseGlobalHistory(id, expected) {
     let browser = document.getElementById(id);
     return ContentTask.spawn(browser, {id, expected}, function({id, expected}) {
       Assert.equal(docShell.useGlobalHistory, expected,
                    "Got the right useGlobalHistory state in the docShell of " + id);
     });
   }
 
-  add_task(async function() {
+  async function run_test() {
     await expectUseGlobalHistory("inprocess_disabled", false);
     await expectUseGlobalHistory("inprocess_enabled", true);
 
     await expectUseGlobalHistory("remote_disabled", false);
     await expectUseGlobalHistory("remote_enabled", true);
     window.opener.done();
     ok(true);
-  });
+  }
 
   </script>
 </window>

--- a/toolkit/components/places/tests/chrome/test_browser_disableglobalhistory.xul
+++ b/toolkit/components/places/tests/chrome/test_browser_disableglobalhistory.xul
@@ -14,12 +14,13 @@
 
   <script type="text/javascript">
   SimpleTest.waitForExplicitFinish();
 
   let w = window.open('browser_disableglobalhistory.xul', '_blank', 'chrome,resizable=yes,width=400,height=600');
 
   function done() {
     w.close();
+    SimpleTest.finish();
   }
   </script>
 
 </window>