diff --git a/js/tests/most.tests b/js/tests/most.tests
index 9bb296cfea8..bee8cb59a0f 100644
--- a/js/tests/most.tests
+++ b/js/tests/most.tests
@@ -21,7 +21,7 @@ ecma/Array/15.4.2.2-2.js
 ecma/Array/15.4.2.3.js
 ecma/Array/15.4.3.1-2.js
 ecma/Array/15.4.3.2.js
-ecma/Array/15.4.3.js
+ecma/extensions/15.4.3.js
 ecma/Array/15.4.4.1.js
 ecma/Array/15.4.4.2.js
 ecma/Array/15.4.4.3-1.js
@@ -41,9 +41,9 @@ ecma/Boolean/15.6.3.1-1.js
 ecma/Boolean/15.6.3.1-2.js
 ecma/Boolean/15.6.3.1-3.js
 ecma/Boolean/15.6.3.1-4.js
-ecma/Boolean/15.6.3.1-5.js
+ecma/extensions/15.6.3.1-5.js
 ecma/Boolean/15.6.3.1.js
-ecma/Boolean/15.6.3.js
+ecma/extensions/15.6.3.js
 ecma/Boolean/15.6.4-1.js
 ecma/Boolean/15.6.4-2.js
 ecma/Boolean/15.6.4.1.js
@@ -216,13 +216,13 @@ ecma/ExecutionContexts/10.1.4-5.js
 ecma/ExecutionContexts/10.1.4-6.js
 ecma/ExecutionContexts/10.1.4-7.js
 ecma/ExecutionContexts/10.1.4-8.js
-ecma/ExecutionContexts/10.1.4-9.js
+ecma/extensions/10.1.4-9.js
 ecma/ExecutionContexts/10.1.5-1.js
 ecma/ExecutionContexts/10.1.5-2.js
 ecma/ExecutionContexts/10.1.5-3.js
 ecma/ExecutionContexts/10.1.5-4.js
-ecma/ExecutionContexts/10.1.6.js
-ecma/ExecutionContexts/10.1.8-1.js
+ecma/extensions/10.1.6.js
+ecma/extensions/10.1.8-1.js
 ecma/ExecutionContexts/10.1.8-2.js
 ecma/ExecutionContexts/10.2.1.js
 ecma/ExecutionContexts/10.2.2-1.js
@@ -318,7 +318,7 @@ ecma/GlobalObject/15.1-1-n.js
 ecma/GlobalObject/15.1-2-n.js
 ecma/GlobalObject/15.1.1.1.js
 ecma/GlobalObject/15.1.1.2.js
-ecma/GlobalObject/15.1.2.1-1.js
+ecma/extensions/15.1.2.1-1.js
 ecma/GlobalObject/15.1.2.1-2.js
 ecma/GlobalObject/15.1.2.2-1.js
 ecma/GlobalObject/15.1.2.2-2.js
@@ -407,7 +407,7 @@ ecma/LexicalConventions/7.7.3-4-n.js
 ecma/LexicalConventions/7.7.3.js
 ecma/LexicalConventions/7.7.4.js
 ecma/LexicalConventions/7.8.2-n.js
-ecma/Math/15.8-1.js
+ecma/extensions/15.8-1.js
 ecma/Math/15.8-2-n.js
 ecma/Math/15.8-3-n.js
 ecma/Math/15.8.1.1-1.js
@@ -446,8 +446,8 @@ ecma/Math/15.8.2.6.js
 ecma/Math/15.8.2.7.js
 ecma/Math/15.8.2.8.js
 ecma/Math/15.8.2.9.js
-ecma/NativeObjects/15-1.js
-ecma/NativeObjects/15-2.js
+ecma/extensions/15-1.js
+ecma/extensions/15-2.js
 ecma/Number/15.7.1.js
 ecma/Number/15.7.2.js
 ecma/Number/15.7.3.1-1.js
@@ -483,7 +483,7 @@ ecma/Number/15.7.4.2-4.js
 ecma/Number/15.7.4.3-1.js
 ecma/Number/15.7.4.3-2.js
 ecma/Number/15.7.4.3-3-n.js
-ecma/Number/15.7.4.js
+ecma/extensions/15.7.4.js
 ecma/ObjectObjects/15.2.1.1.js
 ecma/ObjectObjects/15.2.1.2.js
 ecma/ObjectObjects/15.2.2.1.js
@@ -497,7 +497,7 @@ ecma/ObjectObjects/15.2.3.js
 ecma/ObjectObjects/15.2.4.1.js
 ecma/ObjectObjects/15.2.4.2.js
 ecma/ObjectObjects/15.2.4.3.js
-ecma/ObjectObjects/15.2.4.js
+ecma/extensions/15.2.4.js
 ecma/SourceText/6-1.js
 ecma/SourceText/6-2.js
 ecma/Statements/12.10-1.js
@@ -570,12 +570,12 @@ ecma/String/15.5.4.5-2.js
 ecma/String/15.5.4.5-3.js
 ecma/String/15.5.4.5-4.js
 ecma/String/15.5.4.5-5.js
-ecma/String/15.5.4.5-6.js
+ecma/extensions/15.5.4.5-6.js
 ecma/String/15.5.4.6-1.js
 ecma/String/15.5.4.6-2.js
 ecma/String/15.5.4.7-1.js
 ecma/String/15.5.4.7-2.js
-ecma/String/15.5.4.7-3.js
+ecma/extensions/15.5.4.7-3.js
 ecma/String/15.5.4.8-1.js
 ecma/String/15.5.4.8-2.js
 ecma/String/15.5.4.8-3.js
@@ -704,12 +704,12 @@ ecma_2/Exceptions/statement-009.js
 ecma_2/Exceptions/string-001.js
 ecma_2/Exceptions/string-002.js
 ecma_2/Expressions/StrictEquality-001.js
-ecma_2/Expressions/instanceof-001.js
-ecma_2/Expressions/instanceof-002.js
-ecma_2/Expressions/instanceof-003-n.js
-ecma_2/Expressions/instanceof-004-n.js
-ecma_2/Expressions/instanceof-005-n.js
-ecma_2/Expressions/instanceof-006.js
+ecma_2/extensions/instanceof-001.js
+ecma_2/extensions/instanceof-002.js
+ecma_2/extensions/instanceof-003-n.js
+ecma_2/extensions/instanceof-004-n.js
+ecma_2/extensions/instanceof-005-n.js
+ecma_2/extensions/instanceof-006.js
 ecma_2/FunctionObjects/call-1.js
 ecma_2/LexicalConventions/keywords-001.js
 ecma_2/LexicalConventions/regexp-literals-001.js
@@ -861,16 +861,16 @@ js1_3/Script/function-001-n.js
 js1_3/Script/function-002.js
 js1_3/Script/in-001.js
 js1_3/Script/new-001.js
-js1_3/Script/script-001.js
+js1_3/extensions/script-001.js
 js1_3/Script/switch-001.js
 js1_3/inherit/proto_1.js
 js1_3/inherit/proto_10.js
 js1_3/inherit/proto_11.js
 js1_3/inherit/proto_12.js
-js1_3/inherit/proto_2.js
+js1_3/extensions/proto_2.js
 js1_3/inherit/proto_3.js
 js1_3/inherit/proto_4.js
-js1_3/inherit/proto_5.js
+js1_3/extensions/proto_5.js
 js1_3/inherit/proto_6.js
 js1_3/inherit/proto_7.js
 js1_3/inherit/proto_8.js
diff --git a/js/tests/rhino-n.tests b/js/tests/rhino-n.tests
index ecd016be5be..376dee1f6b8 100644
--- a/js/tests/rhino-n.tests
+++ b/js/tests/rhino-n.tests
@@ -38,14 +38,14 @@ lc3/Exceptions/throw_js_types.js
 lc3/JavaClass/ToJSObject-001.js
 lc3/JSObject/ToJSObject-001.js
 # getter and setters are non-ECMA and not implemented in Rhino.
-js1_5/GetSet/getset-001.js
+js1_5/extensions/getset-001.js
 js1_5/GetSet/getset-002.js
-js1_5/GetSet/getset-003.js
-js1_5/GetSet/getset-004.js
-js1_5/GetSet/getset-005.js
-js1_5/GetSet/getset-006.js
+js1_5/extensions/getset-003.js
+js1_5/extensions/getset-004.js
+js1_5/extensions/getset-005.js
+js1_5/extensions/getset-006.js
 # the const keyword is non-ECMA and  not currently implemented in Rhino (2000-11-01)
-js1_5/Scope/scope-001.js
+js1_5/extensions/scope-001.js
 js1_5/Regress/regress-238881.js
 js1_5/Regress/regress-252892.js
 #Rhino implements Date.toLocaleTimeString() differently than SpiderMonkey
@@ -62,7 +62,7 @@ js1_5/Regress/regress-90445.js
 js1_5/Regress/regress-111557.js
 #Rhino relies on JVM to throw StackOverflow exception and does not 
 #detect too deep recursion explicitly.
-js1_5/Regress/regress-192465.js
+js1_5/extensions/regress-192465.js
 #Skip these two; see http://bugzilla.mozilla.org/show_bug.cgi?id=81086
 ecma_3/Statements/regress-74474-002.js
 ecma_3/Statements/regress-74474-003.js
@@ -109,11 +109,11 @@ js1_5/Regress/regress-249211.js
 # exclude new test  which assumes the defaults are 
 # set according to Spidermonkey.
 #
-js1_5/Exceptions/regress-50447-1.js
+js1_5/extensions/regress-50447-1.js
 #
 # __noSuchMethod__ handler is Spidermonkey only
 #
-js1_5/Object/no-such-method.js
+js1_5/extensions/no-such-method.js
 #
 # Invalid bug
 #
diff --git a/js/tests/slow-n.tests b/js/tests/slow-n.tests
index 8745e4eebbf..0e00ad5af91 100644
--- a/js/tests/slow-n.tests
+++ b/js/tests/slow-n.tests
@@ -15,10 +15,15 @@ js1_5/Array/regress-330812.js
 js1_5/Array/regress-350256-03.js
 js1_5/Function/regress-338121-01.js
 js1_5/Function/regress-338121-02.js
-js1_5/GC/regress-345967.js
 js1_5/GC/regress-346794.js
+js1_5/Object/regress-335700.js
 js1_5/Regress/regress-271716-n.js
 js1_5/Regress/regress-312588.js
-js1_5/Regress/regress-350531.js
+js1_5/extensions/regress-336409-1.js
+js1_5/extensions/regress-336409-2.js
+js1_5/extensions/regress-336410-1.js
+js1_5/extensions/regress-342960.js 
+js1_5/extensions/regress-345967.js
+js1_5/extensions/regress-350531.js
 js1_7/iterable/regress-341815.js
 js1_7/iterable/regress-341821.js
diff --git a/js/tests/spidermonkey-n.tests b/js/tests/spidermonkey-n.tests
index 7a48abce61e..bad6a1394eb 100755
--- a/js/tests/spidermonkey-n.tests
+++ b/js/tests/spidermonkey-n.tests
@@ -16,7 +16,7 @@ js1_5/Regress/regress-119719.js
 # exclude original test which assumes the defaults are 
 # 0 and ''
 #
-js1_5/Exceptions/regress-50447.js
+js1_5/extensions/regress-50447.js
 #
 # Invalid bug
 #
@@ -81,3 +81,7 @@ e4x/Types/9.2.1.7.js
 e4x/XML/13.4.4.1.js
 ecma_2/RegExp/exec-001.js
 ecma_2/String/replace-001.js
+#
+# pre ecma warnings are doa
+#
+js1_5/Regress/regerss-106244.js