diff --git a/test/staging/sm/JSON/cyclic-stringify-unrelated.js b/test/staging/sm/JSON/cyclic-stringify-unrelated.js
index 651cd468ff..c2057bd461 100644
--- a/test/staging/sm/JSON/cyclic-stringify-unrelated.js
+++ b/test/staging/sm/JSON/cyclic-stringify-unrelated.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/cyclic-stringify.js b/test/staging/sm/JSON/cyclic-stringify.js
index a797c4f022..32311b9373 100644
--- a/test/staging/sm/JSON/cyclic-stringify.js
+++ b/test/staging/sm/JSON/cyclic-stringify.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/parse-arguments.js b/test/staging/sm/JSON/parse-arguments.js
index b0b652ea56..e5a836d458 100644
--- a/test/staging/sm/JSON/parse-arguments.js
+++ b/test/staging/sm/JSON/parse-arguments.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/parse-crockford-01.js b/test/staging/sm/JSON/parse-crockford-01.js
index d7c20dcb88..19f3681446 100644
--- a/test/staging/sm/JSON/parse-crockford-01.js
+++ b/test/staging/sm/JSON/parse-crockford-01.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/parse-mega-huge-array.js b/test/staging/sm/JSON/parse-mega-huge-array.js
index 214686f4a1..a8cb9c190f 100644
--- a/test/staging/sm/JSON/parse-mega-huge-array.js
+++ b/test/staging/sm/JSON/parse-mega-huge-array.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/parse-primitives.js b/test/staging/sm/JSON/parse-primitives.js
index 27ed0f57e6..c9dd72c080 100644
--- a/test/staging/sm/JSON/parse-primitives.js
+++ b/test/staging/sm/JSON/parse-primitives.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/parse-reviver-array-delete.js b/test/staging/sm/JSON/parse-reviver-array-delete.js
index 0a4e01d8d2..0dd126be5b 100644
--- a/test/staging/sm/JSON/parse-reviver-array-delete.js
+++ b/test/staging/sm/JSON/parse-reviver-array-delete.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/parse-reviver.js b/test/staging/sm/JSON/parse-reviver.js
index 5ea67160cc..777faf7e6a 100644
--- a/test/staging/sm/JSON/parse-reviver.js
+++ b/test/staging/sm/JSON/parse-reviver.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/parse-with-source.js b/test/staging/sm/JSON/parse-with-source.js
index 250a51a907..354f3fa9be 100644
--- a/test/staging/sm/JSON/parse-with-source.js
+++ b/test/staging/sm/JSON/parse-with-source.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-includes: [compareArray.js, deepEqual.js, sm/non262-JSON-shell.js, sm/non262-shell.js, sm/non262.js]
+includes: [compareArray.js, deepEqual.js, sm/non262-shell.js, sm/non262.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/parse.js b/test/staging/sm/JSON/parse.js
index ccfc3a8d0f..69c0ea38d6 100644
--- a/test/staging/sm/JSON/parse.js
+++ b/test/staging/sm/JSON/parse.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/regress-459293.js b/test/staging/sm/JSON/regress-459293.js
index 8d0fa6595f..5f01838052 100644
--- a/test/staging/sm/JSON/regress-459293.js
+++ b/test/staging/sm/JSON/regress-459293.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-boxed-primitives.js b/test/staging/sm/JSON/stringify-boxed-primitives.js
index 3612da86ae..6d15601302 100644
--- a/test/staging/sm/JSON/stringify-boxed-primitives.js
+++ b/test/staging/sm/JSON/stringify-boxed-primitives.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-call-replacer-once.js b/test/staging/sm/JSON/stringify-call-replacer-once.js
index 701e95498f..c0d1473253 100644
--- a/test/staging/sm/JSON/stringify-call-replacer-once.js
+++ b/test/staging/sm/JSON/stringify-call-replacer-once.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-call-toJSON-once.js b/test/staging/sm/JSON/stringify-call-toJSON-once.js
index 82ca8e0b1e..e8a8b74e3e 100644
--- a/test/staging/sm/JSON/stringify-call-toJSON-once.js
+++ b/test/staging/sm/JSON/stringify-call-toJSON-once.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-dropping-elements.js b/test/staging/sm/JSON/stringify-dropping-elements.js
index 4eb8dca838..b5f90b2ecb 100644
--- a/test/staging/sm/JSON/stringify-dropping-elements.js
+++ b/test/staging/sm/JSON/stringify-dropping-elements.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-gap.js b/test/staging/sm/JSON/stringify-gap.js
index b3ea4e8254..c48304adbc 100644
--- a/test/staging/sm/JSON/stringify-gap.js
+++ b/test/staging/sm/JSON/stringify-gap.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-ignore-noncallable-toJSON.js b/test/staging/sm/JSON/stringify-ignore-noncallable-toJSON.js
index ade740cae7..e352d1aa06 100644
--- a/test/staging/sm/JSON/stringify-ignore-noncallable-toJSON.js
+++ b/test/staging/sm/JSON/stringify-ignore-noncallable-toJSON.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-large-replacer-array.js b/test/staging/sm/JSON/stringify-large-replacer-array.js
index 316bca755c..914e1f22f7 100644
--- a/test/staging/sm/JSON/stringify-large-replacer-array.js
+++ b/test/staging/sm/JSON/stringify-large-replacer-array.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-missing-arguments.js b/test/staging/sm/JSON/stringify-missing-arguments.js
index acf645c3ae..576246f012 100644
--- a/test/staging/sm/JSON/stringify-missing-arguments.js
+++ b/test/staging/sm/JSON/stringify-missing-arguments.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-nonarray-noncallable-replacer.js b/test/staging/sm/JSON/stringify-nonarray-noncallable-replacer.js
index b35e1117a9..2fe6b056ed 100644
--- a/test/staging/sm/JSON/stringify-nonarray-noncallable-replacer.js
+++ b/test/staging/sm/JSON/stringify-nonarray-noncallable-replacer.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-primitives.js b/test/staging/sm/JSON/stringify-primitives.js
index a75abe4b2c..64baf15657 100644
--- a/test/staging/sm/JSON/stringify-primitives.js
+++ b/test/staging/sm/JSON/stringify-primitives.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-replacer-array-boxed-elements.js b/test/staging/sm/JSON/stringify-replacer-array-boxed-elements.js
index 45d2fa98b8..bc31dc7883 100644
--- a/test/staging/sm/JSON/stringify-replacer-array-boxed-elements.js
+++ b/test/staging/sm/JSON/stringify-replacer-array-boxed-elements.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-replacer-array-duplicated-element.js b/test/staging/sm/JSON/stringify-replacer-array-duplicated-element.js
index 3faa47d9de..ab59a76f5c 100644
--- a/test/staging/sm/JSON/stringify-replacer-array-duplicated-element.js
+++ b/test/staging/sm/JSON/stringify-replacer-array-duplicated-element.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-replacer-array-edgecase-jsid-elements.js b/test/staging/sm/JSON/stringify-replacer-array-edgecase-jsid-elements.js
index fbd3663a78..3b32de2475 100644
--- a/test/staging/sm/JSON/stringify-replacer-array-edgecase-jsid-elements.js
+++ b/test/staging/sm/JSON/stringify-replacer-array-edgecase-jsid-elements.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-replacer-array-hijinks.js b/test/staging/sm/JSON/stringify-replacer-array-hijinks.js
index 5821300f59..acb9d60820 100644
--- a/test/staging/sm/JSON/stringify-replacer-array-hijinks.js
+++ b/test/staging/sm/JSON/stringify-replacer-array-hijinks.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-replacer-array-skipped-element.js b/test/staging/sm/JSON/stringify-replacer-array-skipped-element.js
index e3ea27a492..6b7b5628c0 100644
--- a/test/staging/sm/JSON/stringify-replacer-array-skipped-element.js
+++ b/test/staging/sm/JSON/stringify-replacer-array-skipped-element.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-replacer-array-trailing-holes.js b/test/staging/sm/JSON/stringify-replacer-array-trailing-holes.js
index 57671cd10d..d98cc37a44 100644
--- a/test/staging/sm/JSON/stringify-replacer-array-trailing-holes.js
+++ b/test/staging/sm/JSON/stringify-replacer-array-trailing-holes.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-replacer-with-array-indexes.js b/test/staging/sm/JSON/stringify-replacer-with-array-indexes.js
index f1146f70bc..07f8e13782 100644
--- a/test/staging/sm/JSON/stringify-replacer-with-array-indexes.js
+++ b/test/staging/sm/JSON/stringify-replacer-with-array-indexes.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-replacer.js b/test/staging/sm/JSON/stringify-replacer.js
index 695815d91d..fb9c5b7397 100644
--- a/test/staging/sm/JSON/stringify-replacer.js
+++ b/test/staging/sm/JSON/stringify-replacer.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-special-escapes.js b/test/staging/sm/JSON/stringify-special-escapes.js
index 8c866ff5f6..aa9a52a615 100644
--- a/test/staging/sm/JSON/stringify-special-escapes.js
+++ b/test/staging/sm/JSON/stringify-special-escapes.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify-toJSON-arguments.js b/test/staging/sm/JSON/stringify-toJSON-arguments.js
index 3bafcbbefa..afa9593374 100644
--- a/test/staging/sm/JSON/stringify-toJSON-arguments.js
+++ b/test/staging/sm/JSON/stringify-toJSON-arguments.js
@@ -4,7 +4,7 @@
  */
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |
diff --git a/test/staging/sm/JSON/stringify.js b/test/staging/sm/JSON/stringify.js
index b082f3a53c..29ccb91c3c 100644
--- a/test/staging/sm/JSON/stringify.js
+++ b/test/staging/sm/JSON/stringify.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-includes: [sm/non262.js, sm/non262-shell.js, sm/non262-JSON-shell.js]
+includes: [sm/non262.js, sm/non262-shell.js]
 flags:
   - noStrict
 description: |