diff --git a/js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-01.js b/js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-01.js
index 08d2bd56d74..9c7b4f92e01 100644
--- a/js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-01.js
+++ b/js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-01.js
@@ -6,9 +6,10 @@ var correct;
 dbg.onEnterFrame = function (f) {
   if (f.callee && f.callee.name == "f") {
     f.onPop = function() {
-      // The scope at the point of onPop is the outermost.
-      correct = (f.environment.getVariable("e") === undefined &&
-                 f.environment.getVariable("outer") === 43);
+      // The scope at the point of onPop is at the point of popping (the
+      // noSuchFn call).
+      correct = (f.environment.getVariable("e") === 42 &&
+                 f.environment.getVariable("outer") === undefined);
     };
   }
 };
diff --git a/js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-02.js b/js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-02.js
index 5938f1bb477..157dbf5bbbd 100644
--- a/js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-02.js
+++ b/js/src/jit-test/tests/debug/Frame-onPop-error-scope-unwind-02.js
@@ -6,9 +6,10 @@ var correct;
 dbg.onEnterFrame = function (f) {
   if (f.callee && f.callee.name == "f") {
     f.onPop = function() {
-      // The scope at the point of onPop is the outermost.
-      correct = (f.environment.getVariable("e") === undefined &&
-                 f.environment.getVariable("outer") === 43);
+      // The scope at the point of onPop is at the point of popping (the
+      // noSuchFn call).
+      correct = (f.environment.getVariable("e") === 42 &&
+                 f.environment.getVariable("outer") === undefined);
     };
   }
 };