Untitled

diff --git a/dom/tests/mochitest/whatwg/test_postMessage_override.html b/dom/tests/mochitest/whatwg/test_postMessage_override.html
index 4276bc90f2ff..a5ed9f14a26d 100644
--- a/dom/tests/mochitest/whatwg/test_postMessage_override.html
+++ b/dom/tests/mochitest/whatwg/test_postMessage_override.html
@@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=postMessage
 -->
 <head>
   <title>postMessage override test</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@@ -23,7 +23,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=postMessage
 SimpleTest.waitForExplicitFinish();

 var count = 0;
-
+var received = 0;
 function test(callback)
 {
   try
@@ -38,7 +38,7 @@ function test(callback)
       case 2:
         window.frames[0].postMessage("PASS 2", "http://example.org:8000");
         break;
-
+
       default:
         ok(false, "unexpected");
     }
@@ -63,8 +63,8 @@ function test(callback)
 function messageReceiver(evt)
 {
   var expect;
-
-  switch (count)
+  received++;
+  switch (received)
   {
     case 1:
       expect = "PASS 1";
@@ -80,7 +80,11 @@ function messageReceiver(evt)
   }

   is(evt.data, expect,
-     "uh-oh, we (" + count + ") didn't get the right postMessage!");
+     "uh-oh, we (" + received + ") didn't get the right postMessage!");
+
+  if (received == 2) {
+    SimpleTest.finish();
+  }
 }

 window.addEventListener("message", messageReceiver);
@@ -89,10 +93,7 @@ function run()
 {
   test(function()
   {
-    test(function()
-    {
-      SimpleTest.finish();
-    }, 0);
+    test(function(){});
   });
 }