diff --git a/content/xul/document/test/test_bug583948.xul b/content/xul/document/test/test_bug583948.xul
index 630eb0e5f4d..76507cda685 100644
--- a/content/xul/document/test/test_bug583948.xul
+++ b/content/xul/document/test/test_bug583948.xul
@@ -18,24 +18,22 @@ SimpleTest.waitForExplicitFinish();
 var attempts = 0;
 
 function update() {
-  setTimeout(function() {
-    if (otherWindow.location)
-      otherWindow.location.reload()
-    }, 1);
-  otherWindow.document.commandDispatcher.updateCommands('');
   // without the crash fix, this usually crashes after 2 to 4 reloads
   if (++attempts == 6) {
     ok(true, "didn't crash after 6 attempts");
     otherWindow.close();
-    SimpleTest.finish();
-  }
-  else {
-    setTimeout(update, 100);
+    SimpleTest.waitForFocus(function() {
+      SimpleTest.finish();
+    });
+  } else {
+    otherWindow.document.commandDispatcher.updateCommands('');
+    setTimeout(function() {
+      otherWindow.location.reload()
+    }, 0);
   }
 }
 
 var otherWindow = window.open("window_bug583948.xul", "_new", "chrome");
-setTimeout(update, 100);
 </script>
 
 </window>
diff --git a/content/xul/document/test/window_bug583948.xul b/content/xul/document/test/window_bug583948.xul
index 332496d0bc9..d0f6a26926e 100644
--- a/content/xul/document/test/window_bug583948.xul
+++ b/content/xul/document/test/window_bug583948.xul
@@ -1,5 +1,5 @@
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="opener.update()">
 
 <command oncommandupdate="document.removeChild(document.documentElement)" commandupdater="true"/>
 <box command="c"/>