--- a/testing/mochitest/browser-test.js
+++ b/testing/mochitest/browser-test.js
@@ -78,16 +78,20 @@ Tester.prototype = {
                                               : "Found an unexpected {elt}";
 
     if (this.currentTest && window.gBrowser && gBrowser.tabs.length > 1) {
       while (gBrowser.tabs.length > 1) {
         let lastTab = gBrowser.tabContainer.lastChild;
         let msg = baseMsg.replace("{elt}", "tab") +
                   ": " + lastTab.linkedBrowser.currentURI.spec;
         this.currentTest.addResult(new testResult(false, msg, "", false));
+        if (gBrowser._removingTabs && gBrowser._removingTabs.indexOf(lastTab) > -1) {
+          gBrowser._endRemoveTab(lastTab);
+          continue;
+        }
         gBrowser.removeTab(lastTab);
       }
     }
 
     this.dumper.dump("TEST-INFO | checking window state\n");
     let windowsEnum = this._wm.getEnumerator("navigator:browser");
     while (windowsEnum.hasMoreElements()) {
       let win = windowsEnum.getNext();