diff --git a/browser/devtools/debugger/test/browser_dbg_step-out.js b/browser/devtools/debugger/test/browser_dbg_step-out.js
index 2b8c3c4782d..37df052b56e 100644
--- a/browser/devtools/debugger/test/browser_dbg_step-out.js
+++ b/browser/devtools/debugger/test/browser_dbg_step-out.js
@@ -19,7 +19,6 @@ function test()
     gPane = aPane;
     gDebugger = gPane.panelWin;
 
-    expectUncaughtException();
     testNormalReturn();
   });
 }
diff --git a/browser/devtools/debugger/test/test-step-out.html b/browser/devtools/debugger/test/test-step-out.html
index b7737f3be18..c1923677216 100644
--- a/browser/devtools/debugger/test/test-step-out.html
+++ b/browser/devtools/debugger/test/test-step-out.html
@@ -18,10 +18,15 @@
         return r;
       }
       function error(aArg) {
-        debugger;
-        var r = 10;
-        throw "boom";
-        return r;
+        function inner(aArg) {
+          debugger;
+          var r = 10;
+          throw "boom";
+          return r;
+        }
+        try {
+          inner(aArg);
+        } catch (e) {}
       }
       var button = document.getElementById("return");
       button.addEventListener("click", normal, false);