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 98aa79cfb099..ae1f03d16b0b 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,7 +43,6 @@
 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 26d6e4a972c8..d8c8990a3544 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,7 +44,6 @@
 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);
 }
@@ -58,7 +57,6 @@ 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 8373133dd114..4a9e40e450cc 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,7 +29,6 @@ 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 cb74c90038aa..11424f37b34f 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,7 +18,6 @@ function tabLoaded(aEvent) {
   HUDService.activateHUDForContext(gBrowser.selectedTab);
 
   gBrowser.selectedBrowser.addEventListener("load", tabReloaded, true);
-  expectUncaughtException();
   content.location.reload();
 }
 
@@ -44,7 +43,6 @@ function tabReloaded(aEvent) {
 
     newTabIsOpen = true;
     gBrowser.selectedBrowser.addEventListener("load", tabLoaded, true);
-    expectUncaughtException();
     content.location = TEST_URI;
   });
 }
@@ -55,7 +53,6 @@ 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 ef8a47f2ebb7..0f9af96be560 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,7 +64,6 @@ 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 da22c9be884b..c79e24b57727 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,7 +90,6 @@ 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 d5360d0becdd..6ac6f33712bc 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,7 +25,6 @@ function onLoad(aEvent) {
 
   gHudId = HUDService.getHudIdByWindow(content);
   browser.addEventListener("load", testWebDevLimits, true);
-  expectUncaughtException();
   content.location = TEST_URI;
 }
 
@@ -71,7 +70,6 @@ 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 fbdcbd95c005..c684ded0c390 100644
--- a/browser/devtools/webconsole/test/browser/browser_webconsole_network_panel.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_network_panel.js
@@ -417,10 +417,7 @@ function testGen() {
   networkPanel = HUDService.openNetworkPanel(filterBox, httpActivity);
   networkPanel.isDoneCallback = function NP_doneCallback() {
     networkPanel.isDoneCallback = null;
-    try {
-      testDriver.next();
-    } catch (e if e instanceof StopIteration) {
-    }
+    testDriver.next();
   }
 
   yield;
@@ -481,5 +478,5 @@ function testGen() {
   networkPanel.panel.hidePopup(); */
 
   // All done!
-  finish();
+  finishTest();
 }
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 5c77c597c620..d36faa7ca627 100644
--- a/browser/devtools/webconsole/test/browser/browser_webconsole_view_source.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_view_source.js
@@ -7,7 +7,6 @@
 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);
 }