diff --git a/mozilla/js/tests/e4x/QName/regress-373595-03.js b/mozilla/js/tests/e4x/QName/regress-373595-03.js
index 4eef1f37e87..723448831e9 100755
--- a/mozilla/js/tests/e4x/QName/regress-373595-03.js
+++ b/mozilla/js/tests/e4x/QName/regress-373595-03.js
@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-gTestfile = 'regress-373595-02.js';
+gTestfile = 'regress-373595-03.js';
 
 var summary = '13.3 QName Objects - Do not assert: op == JSOP_ADD';
 var BUGNUMBER = 373595;
diff --git a/mozilla/js/tests/ecma_3/RegExp/regress-375715-01-n.js b/mozilla/js/tests/ecma_3/RegExp/regress-375715-01-n.js
index a38f547f0c4..437dcbd5c5e 100755
--- a/mozilla/js/tests/ecma_3/RegExp/regress-375715-01-n.js
+++ b/mozilla/js/tests/ecma_3/RegExp/regress-375715-01-n.js
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var gTestfile = 'regress-375715-01.js';
+var gTestfile = 'regress-375715-01-n.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 375715;
 var summary = 'Do not assert: (c2 <= cs->length) && (c1 <= c2)';
diff --git a/mozilla/js/tests/js1_5/GC/regress-338653.js b/mozilla/js/tests/js1_5/GC/regress-338653.js
index cd48b73ca9c..79d69cf13f7 100755
--- a/mozilla/js/tests/js1_5/GC/regress-338653.js
+++ b/mozilla/js/tests/js1_5/GC/regress-338653.js
@@ -38,7 +38,7 @@
 
 var gTestfile = 'regress-338653.js';
 //-----------------------------------------------------------------------------
-var BUGNUMBER = 338652;
+var BUGNUMBER = 338653;
 var summary = 'Force GC when JSRuntime.gcMallocBytes hits ' +
   'JSRuntime.gcMaxMallocBytes';
 var actual = 'No Crash';
diff --git a/mozilla/js/tests/js1_5/Object/regress-382503.js b/mozilla/js/tests/js1_5/Object/regress-382503.js
index be8650dbd01..3d1b13c35f5 100755
--- a/mozilla/js/tests/js1_5/Object/regress-382503.js
+++ b/mozilla/js/tests/js1_5/Object/regress-382503.js
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var gTestfile = 'regress-383503.js';
+var gTestfile = 'regress-382503.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 382503;
 var summary = 'Do not assert: with prototype=regexp';
diff --git a/mozilla/js/tests/js1_5/Regress/regress-246964.js b/mozilla/js/tests/js1_5/Regress/regress-246964.js
index 3f26fc3024c..3469cc363f5 100755
--- a/mozilla/js/tests/js1_5/Regress/regress-246964.js
+++ b/mozilla/js/tests/js1_5/Regress/regress-246964.js
@@ -49,7 +49,12 @@ var expect = '';
 printBugNumber(BUGNUMBER);
 printStatus (summary);
 
-if (typeof document != 'undefined')
+if (typeof document == 'undefined')
+{
+  expect = actual = 'Test requires browser: skipped';
+  reportCompare(expect, actual, summary);
+}
+else
 {
   status = summary + ' ' + inSection(1) + ' if (document.all) ';
   expect = false;
diff --git a/mozilla/js/tests/js1_5/Regress/regress-398085-01.js b/mozilla/js/tests/js1_5/Regress/regress-398085-01.js
index 4552c895e36..d40376458a3 100644
--- a/mozilla/js/tests/js1_5/Regress/regress-398085-01.js
+++ b/mozilla/js/tests/js1_5/Regress/regress-398085-01.js
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var gTestfile = 'regress-398095-01.js';
+var gTestfile = 'regress-398085-01.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 398095;
 var summary = 'Do not crash with large switch statement';
diff --git a/mozilla/js/tests/js1_5/extensions/regress-365869.js b/mozilla/js/tests/js1_5/extensions/regress-365869.js
index 288da4be157..c710ca50f47 100755
--- a/mozilla/js/tests/js1_5/extensions/regress-365869.js
+++ b/mozilla/js/tests/js1_5/extensions/regress-365869.js
@@ -77,7 +77,7 @@ function test()
  
   reportCompare(expect, actual, summary);
 
-  print('test crash from bug 371292');
+  print('test crash from bug 371292 Comment 3');
 
   try
   {
@@ -94,5 +94,22 @@ function test()
  
   reportCompare(expect, actual, summary);
 
+
+  print('test crash from bug 371292 Comment 9');
+
+  try
+  {
+    expect = 'TypeError: redeclaration of const 5';
+    "012345".__defineSetter__(5, function(){});
+  }
+  catch(ex)
+  {
+    actual = ex + '';
+    print(ex);
+  }
+
+  reportCompare(expect, actual, summary);
+
+
   exitFunc ('test');
 }
diff --git a/mozilla/js/tests/js1_7/extensions/regress-387955-02.js b/mozilla/js/tests/js1_7/extensions/regress-387955-02.js
index 121226e440d..f2bf81a2874 100755
--- a/mozilla/js/tests/js1_7/extensions/regress-387955-02.js
+++ b/mozilla/js/tests/js1_7/extensions/regress-387955-02.js
@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var gTestfile = 'regress-387955.js';
+var gTestfile = 'regress-387955-02.js';
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 387955;
diff --git a/mozilla/js/tests/js1_7/extensions/regress-392308.js b/mozilla/js/tests/js1_7/extensions/regress-392308.js
index b3ceb2e0208..b1d52a2e8d8 100755
--- a/mozilla/js/tests/js1_7/extensions/regress-392308.js
+++ b/mozilla/js/tests/js1_7/extensions/regress-392308.js
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var gTestfile = 'regress--392308.js';
+var gTestfile = 'regress-392308.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 392308;
 var summary = 'StopIteration should be catchable';
diff --git a/mozilla/js/tests/js1_7/geniter/regress-392310.js b/mozilla/js/tests/js1_7/geniter/regress-392310.js
index c2710b93a55..7df4ff43239 100755
--- a/mozilla/js/tests/js1_7/geniter/regress-392310.js
+++ b/mozilla/js/tests/js1_7/geniter/regress-392310.js
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var gTestfile = 'regress--392310.js';
+var gTestfile = 'regress-392310.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 392310;
 var summary = 'send on newborn generator';
diff --git a/mozilla/js/tests/js1_7/regress/regress-385133-02.js b/mozilla/js/tests/js1_7/regress/regress-385133-02.js
index 085ec9d41af..777b7907dd6 100755
--- a/mozilla/js/tests/js1_7/regress/regress-385133-02.js
+++ b/mozilla/js/tests/js1_7/regress/regress-385133-02.js
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var gTestfile = 'regress-385133-01.js';
+var gTestfile = 'regress-385133-02.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 385133;
 var summary = 'Do not crash due to recursion with watch, setter, delete, generator';
diff --git a/mozilla/js/tests/js1_8/extensions/regress-385393-11.js b/mozilla/js/tests/js1_8/extensions/regress-385393-11.js
index 15cd6b953a1..be5db8f82a4 100755
--- a/mozilla/js/tests/js1_8/extensions/regress-385393-11.js
+++ b/mozilla/js/tests/js1_8/extensions/regress-385393-11.js
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var gTestfile = 'regress-385393-10.js';
+var gTestfile = 'regress-385393-11.js';
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 385393;