--- a/toolkit/mozapps/extensions/test/browser/browser_bug557956.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug557956.js
@@ -229,23 +229,25 @@ add_test(function() {
             EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
 
             wait_for_page(aWindow, "finished", function(aWindow) {
               var button = doc.documentElement.getButton("finish");
               ok(!button.hidden, "Finish button should not be hidden");
               ok(!button.disabled, "Finish button should not be disabled");
               EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
 
-              AddonManager.getAddonsByIDs(["addon8@tests.mozilla.org",
-                                           "addon9@tests.mozilla.org"],
-                                           function([a8, a9]) {
-                is(a8.version, "2.0", "addon8 should have updated");
-                is(a9.version, "2.0", "addon9 should have updated");
-
-                uninstall_test_addons(run_next_test);
+              wait_for_window_close(aWindow, function() {
+                AddonManager.getAddonsByIDs(["addon8@tests.mozilla.org",
+                                             "addon9@tests.mozilla.org"],
+                                             function([a8, a9]) {
+                  is(a8.version, "2.0", "addon8 should have updated");
+                  is(a9.version, "2.0", "addon9 should have updated");
+  
+                  uninstall_test_addons(run_next_test);
+                });
               });
             });
           });
         });
       });
     });
   });
 });
@@ -312,19 +314,21 @@ add_test(function() {
             var button = doc.documentElement.getButton("next");
             EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
 
             wait_for_page(aWindow, "installerrors", function(aWindow) {
               var button = doc.documentElement.getButton("finish");
               ok(!button.hidden, "Finish button should not be hidden");
               ok(!button.disabled, "Finish button should not be disabled");
 
-              EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
+              wait_for_window_close(aWindow, function() {
+                uninstall_test_addons(run_next_test);
+              });
 
-              uninstall_test_addons(run_next_test);
+              EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
             });
           });
         });
       });
     });
   });
 });
 
@@ -395,17 +399,20 @@ add_test(function() {
 
           var button = doc.documentElement.getButton("next");
           EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
 
           wait_for_page(aWindow, "noupdates", function(aWindow) {
             var button = doc.documentElement.getButton("finish");
             ok(!button.hidden, "Finish button should not be hidden");
             ok(!button.disabled, "Finish button should not be disabled");
-            EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
 
-            uninstall_test_addons(run_next_test);
+            wait_for_window_close(aWindow, function() {
+              uninstall_test_addons(run_next_test);
+            });
+
+            EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
           });
         });
       });
     });
   });
 });