diff --git a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_580030_errors_after_page_reload.js b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_580030_errors_after_page_reload.js
index ae1f03d16b0b..98aa79cfb099 100644
--- a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_580030_errors_after_page_reload.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_580030_errors_after_page_reload.js
@@ -43,6 +43,7 @@
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-error.html";
 
 function test() {
+  expectUncaughtException();
   addTab(TEST_URI);
   browser.addEventListener("load", onLoad, true);
 }
diff --git a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_582201_duplicate_errors.js b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_582201_duplicate_errors.js
index d8c8990a3544..26d6e4a972c8 100644
--- a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_582201_duplicate_errors.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_582201_duplicate_errors.js
@@ -44,6 +44,7 @@
 const TEST_DUPLICATE_ERROR_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-duplicate-error.html";
 
 function test() {
+  expectUncaughtException();
   addTab(TEST_DUPLICATE_ERROR_URI);
   browser.addEventListener("DOMContentLoaded", testDuplicateErrors, false);
 }
@@ -57,6 +58,7 @@ function testDuplicateErrors() {
 
   Services.console.registerListener(consoleObserver);
 
+  expectUncaughtException();
   content.location.reload();
 }
 
diff --git a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_597136_external_script_errors.js b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_597136_external_script_errors.js
index 4a9e40e450cc..8373133dd114 100644
--- a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_597136_external_script_errors.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_597136_external_script_errors.js
@@ -29,6 +29,7 @@ function contentLoaded(aEvent) {
   browser.removeEventListener("load", contentLoaded, true);
 
   let button = content.document.querySelector("button");
+  expectUncaughtException();
   EventUtils.sendMouseEvent({ type: "click" }, button, content);
   executeSoon(buttonClicked);
 }
diff --git a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_597756_reopen_closed_tab.js b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_597756_reopen_closed_tab.js
index 11424f37b34f..cb74c90038aa 100644
--- a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_597756_reopen_closed_tab.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_597756_reopen_closed_tab.js
@@ -18,6 +18,7 @@ function tabLoaded(aEvent) {
   HUDService.activateHUDForContext(gBrowser.selectedTab);
 
   gBrowser.selectedBrowser.addEventListener("load", tabReloaded, true);
+  expectUncaughtException();
   content.location.reload();
 }
 
@@ -43,6 +44,7 @@ function tabReloaded(aEvent) {
 
     newTabIsOpen = true;
     gBrowser.selectedBrowser.addEventListener("load", tabLoaded, true);
+    expectUncaughtException();
     content.location = TEST_URI;
   });
 }
@@ -53,6 +55,7 @@ function testEnd() {
 }
 
 function test() {
+  expectUncaughtException();
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoaded, true);
 }
diff --git a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_601177_log_levels.js b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_601177_log_levels.js
index 0f9af96be560..ef8a47f2ebb7 100644
--- a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_601177_log_levels.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_601177_log_levels.js
@@ -64,6 +64,7 @@ function test()
       browser.removeEventListener(aEvent.type, arguments.callee, true);
       executeSoon(onContentLoaded);
     }, true);
+    expectUncaughtException();
     content.location = TEST_URI;
   }, true);
 }
diff --git a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_618078_network_exceptions.js b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_618078_network_exceptions.js
index c79e24b57727..da22c9be884b 100644
--- a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_618078_network_exceptions.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_618078_network_exceptions.js
@@ -90,6 +90,7 @@ function test()
     registerCleanupFunction(testEnd);
 
     executeSoon(function() {
+      expectUncaughtException();
       content.location = TEST_URI;
     });
   }, true);
diff --git a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_644419_log_limits.js b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_644419_log_limits.js
index 6ac6f33712bc..d5360d0becdd 100644
--- a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_644419_log_limits.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_644419_log_limits.js
@@ -25,6 +25,7 @@ function onLoad(aEvent) {
 
   gHudId = HUDService.getHudIdByWindow(content);
   browser.addEventListener("load", testWebDevLimits, true);
+  expectUncaughtException();
   content.location = TEST_URI;
 }
 
@@ -70,6 +71,7 @@ function testJsLimits(aEvent) {
   for (let i = 0; i < 11; i++) {
     var script = content.document.createElement("script");
     script.text = "fubar" + i + ".bogus(6);";
+    expectUncaughtException();
     head.insertBefore(script, head.firstChild);
   }
 
diff --git a/browser/devtools/webconsole/test/browser/browser_webconsole_network_panel.js b/browser/devtools/webconsole/test/browser/browser_webconsole_network_panel.js
index c684ded0c390..fbdcbd95c005 100644
--- a/browser/devtools/webconsole/test/browser/browser_webconsole_network_panel.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_network_panel.js
@@ -417,7 +417,10 @@ function testGen() {
   networkPanel = HUDService.openNetworkPanel(filterBox, httpActivity);
   networkPanel.isDoneCallback = function NP_doneCallback() {
     networkPanel.isDoneCallback = null;
-    testDriver.next();
+    try {
+      testDriver.next();
+    } catch (e if e instanceof StopIteration) {
+    }
   }
 
   yield;
@@ -478,5 +481,5 @@ function testGen() {
   networkPanel.panel.hidePopup(); */
 
   // All done!
-  finishTest();
+  finish();
 }
diff --git a/browser/devtools/webconsole/test/browser/browser_webconsole_view_source.js b/browser/devtools/webconsole/test/browser/browser_webconsole_view_source.js
index d36faa7ca627..5c77c597c620 100644
--- a/browser/devtools/webconsole/test/browser/browser_webconsole_view_source.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_view_source.js
@@ -7,6 +7,7 @@
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-error.html";
 
 function test() {
+  expectUncaughtException();
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testViewSource, false);
 }