diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list
--- a/js/src/tests/jstests.list
+++ b/js/src/tests/jstests.list
@@ -1,15 +1,15 @@
 # Manifest entries for imported test suites whose individual test cases
 # we don't want to change.
 
 # Skip the folder with tests for the scripts
 skip include test/jstests.list
 
-skip script ecma_6/String/normalize-generateddata-input.js # input data for other test
+skip script non262/String/normalize-generateddata-input.js # input data for other test
 
 # Skip intl402 tests when Intl isn't available.
 skip-if(!this.hasOwnProperty('Intl')) include test262/intl402/jstests.list
 
 # Skip built-ins/Simd tests when SIMD isn't available.
 skip-if(!this.hasOwnProperty('SIMD')) include test262/built-ins/Simd/jstests.list
 
 # Times out on arm and cgc builds.
diff --git a/js/src/tests/non262/String/make-normalize-generateddata-input.py b/js/src/tests/non262/String/make-normalize-generateddata-input.py
--- a/js/src/tests/non262/String/make-normalize-generateddata-input.py
+++ b/js/src/tests/non262/String/make-normalize-generateddata-input.py
@@ -1,30 +1,30 @@
 #!/usr/bin/python -B
 
 """ Usage: make-normalize-generateddata-input.py PATH_TO_MOZILLA_CENTRAL
 
     This script generates test input data for String.prototype.normalize
     from intl/icu/source/data/unidata/NormalizationTest.txt
-    to js/src/tests/ecma_6/String/normalize-generateddata-input.js
+    to js/src/tests/non262/String/normalize-generateddata-input.js
 """
 
 from __future__ import print_function
 import re, sys
 
 sep_pat = re.compile(' +')
 def to_code_list(codes):
     return '[' + ', '.join(map(lambda x: '0x{0}'.format(x), re.split(sep_pat, codes))) + ']'
 
 def convert(dir):
     ver_pat = re.compile('NormalizationTest-([0-9\.]+)\.txt')
     part_pat = re.compile('^@(Part([0-9]+) .+)$')
     test_pat = re.compile('^([0-9A-Fa-f ]+);([0-9A-Fa-f ]+);([0-9A-Fa-f ]+);([0-9A-Fa-f ]+);([0-9A-Fa-f ]+);$')
     ignore_pat = re.compile('^#|^$')
-    js_path = 'js/src/tests/ecma_6/String/normalize-generateddata-input.js'
+    js_path = 'js/src/tests/non262/String/normalize-generateddata-input.js'
     txt_path = 'intl/icu/source/data/unidata/NormalizationTest.txt'
 
     part_opened = False
     not_empty = False
     with open('{dir}/{path}'.format(dir=dir, path=txt_path), 'r') as f:
         with open('{dir}/{path}'.format(dir=dir, path=js_path), 'w') as outf:
             for line in f:
                 m = test_pat.search(line)
diff --git a/js/src/tests/non262/String/normalize-generateddata-part0.js b/js/src/tests/non262/String/normalize-generateddata-part0.js
--- a/js/src/tests/non262/String/normalize-generateddata-part0.js
+++ b/js/src/tests/non262/String/normalize-generateddata-part0.js
@@ -1,17 +1,17 @@
 // |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 
 var BUGNUMBER = 918987;
 var summary = 'String.prototype.normalize - part0';
 
 print(BUGNUMBER + ": " + summary);
 
 function test() {
-  load('ecma_6/String/normalize-generateddata-input.js');
+  loadRelativeToScript('normalize-generateddata-input.js');
 
   for (var test0 of tests_part0) {
     runNormalizeTest(test0);
   }
 }
 
 if ("normalize" in String.prototype) {
   // String.prototype.normalize is not enabled in all builds.
diff --git a/js/src/tests/non262/String/normalize-generateddata-part1-not-listed.js b/js/src/tests/non262/String/normalize-generateddata-part1-not-listed.js
--- a/js/src/tests/non262/String/normalize-generateddata-part1-not-listed.js
+++ b/js/src/tests/non262/String/normalize-generateddata-part1-not-listed.js
@@ -1,17 +1,17 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 
 var BUGNUMBER = 918987;
 var summary = 'String.prototype.normalize - not listed in part1';
 
 print(BUGNUMBER + ": " + summary);
 
 function test() {
-  load('ecma_6/String/normalize-generateddata-input.js');
+  loadRelativeToScript('normalize-generateddata-input.js');
 
   var part1 = new Set();
   for (var test1 of tests_part1) {
     part1.add(test1.source[0]);
   }
 
   /* not listed in Part 1 */
   for (var x = 0; x <= 0x2FFFF; x++) {
diff --git a/js/src/tests/non262/String/normalize-generateddata-part1.js b/js/src/tests/non262/String/normalize-generateddata-part1.js
--- a/js/src/tests/non262/String/normalize-generateddata-part1.js
+++ b/js/src/tests/non262/String/normalize-generateddata-part1.js
@@ -1,17 +1,17 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 
 var BUGNUMBER = 918987;
 var summary = 'String.prototype.normalize - part1';
 
 print(BUGNUMBER + ": " + summary);
 
 function test() {
-  load('ecma_6/String/normalize-generateddata-input.js');
+  loadRelativeToScript('normalize-generateddata-input.js');
 
   for (var test1 of tests_part1) {
     runNormalizeTest(test1);
   }
 }
 
 if ("normalize" in String.prototype) {
   // String.prototype.normalize is not enabled in all builds.
diff --git a/js/src/tests/non262/String/normalize-generateddata-part2.js b/js/src/tests/non262/String/normalize-generateddata-part2.js
--- a/js/src/tests/non262/String/normalize-generateddata-part2.js
+++ b/js/src/tests/non262/String/normalize-generateddata-part2.js
@@ -1,17 +1,17 @@
 // |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 
 var BUGNUMBER = 918987;
 var summary = 'String.prototype.normalize - part2';
 
 print(BUGNUMBER + ": " + summary);
 
 function test() {
-  load('ecma_6/String/normalize-generateddata-input.js');
+  loadRelativeToScript('normalize-generateddata-input.js');
 
   for (var test2 of tests_part2) {
     runNormalizeTest(test2);
   }
 }
 
 if ("normalize" in String.prototype) {
   // String.prototype.normalize is not enabled in all builds.
diff --git a/js/src/tests/non262/String/normalize-generateddata-part3.js b/js/src/tests/non262/String/normalize-generateddata-part3.js
--- a/js/src/tests/non262/String/normalize-generateddata-part3.js
+++ b/js/src/tests/non262/String/normalize-generateddata-part3.js
@@ -1,17 +1,17 @@
 // |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 
 var BUGNUMBER = 918987;
 var summary = 'String.prototype.normalize - part3';
 
 print(BUGNUMBER + ": " + summary);
 
 function test() {
-  load('ecma_6/String/normalize-generateddata-input.js');
+  loadRelativeToScript('normalize-generateddata-input.js');
 
   for (var test3 of tests_part3) {
     runNormalizeTest(test3);
   }
 }
 
 if ("normalize" in String.prototype) {
   // String.prototype.normalize is not enabled in all builds.
diff --git a/js/src/tests/non262/extensions/regress-50447-1.js b/js/src/tests/non262/extensions/regress-50447-1.js
--- a/js/src/tests/non262/extensions/regress-50447-1.js
+++ b/js/src/tests/non262/extensions/regress-50447-1.js
@@ -95,17 +95,17 @@ function test2()
   /* generate an error with only msg property */
 
 
   /* note this test incorporates the path to the
      test file and assumes the path to the test case
      is a subdirectory of the directory containing jsDriver.pl
   */
   var expectedLine = 109;
-  var expectedFileName = 'js1_5/extensions/regress-50447-1.js';
+  var expectedFileName = 'non262/extensions/regress-50447-1.js';
   if (typeof document != "undefined") {
     expectedFileName = document.location.href.
       replace(/[^\/]*(\?.*)$/, '') +
       expectedFileName;
   }
   var e = new InternalError ("msg");
   reportCompare ("(new InternalError(\"msg\", \"" +
 		 expectedFileName + "\", " + expectedLine + "))",
@@ -126,17 +126,17 @@ function test3()
 
   /* note this test incorporates the path to the
      test file and assumes the path to the test case
      is a subdirectory of the directory containing jsDriver.pl
   */
 
 
 
-  var expectedFileName = 'js1_5/extensions/regress-50447-1.js';
+  var expectedFileName = 'non262/extensions/regress-50447-1.js';
   if (typeof document != "undefined") {
     expectedFileName = document.location.href.
       replace(/[^\/]*(\?.*)$/, '') +
       expectedFileName;
   }
 
   var e = new InternalError ("msg");
   e.lineNumber = 10;
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-01-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-01-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-01-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-01-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(1, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-02-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-02-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-02-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-02-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(2, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-03-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-03-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-03-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-03-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(3, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-04-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-04-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-04-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-04-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(4, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-05-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-05-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-05-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-05-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(5, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-06-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-06-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-06-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-06-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(6, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-07-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-07-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-07-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-07-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(7, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-08-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-08-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-08-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-08-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(8, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-09-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-09-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-09-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-09-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(9, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-10-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-10-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-10-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-10-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(10, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-11-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-11-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-11-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-11-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(11, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-12-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-12-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-12-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-12-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(12, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-13-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-13-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-13-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-13-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(13, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-14-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-14-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-14-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-14-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(14, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-15-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-15-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-15-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-15-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(15, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-16-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-16-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-16-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-16-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(16, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-17-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-17-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-17-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-17-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(17, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-18-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-18-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-18-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-18-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(18, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-19-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-19-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-19-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-19-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(19, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-20-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-20-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-20-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-20-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(20, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-21-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-21-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-21-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-21-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(21, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-22-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-22-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-22-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-22-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(22, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-23-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-23-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-23-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-23-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(23, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-24-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-24-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-24-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-24-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(24, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-25-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-25-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-25-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-25-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(25, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-26-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-26-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-26-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-26-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(26, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-27-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-27-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-27-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-27-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(27, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-28-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-28-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-28-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-28-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(28, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-29-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-29-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-29-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-29-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(29, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-30-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-30-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-30-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-30-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(30, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-31-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-31-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-31-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-31-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(31, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-32-of-32.js b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-32-of-32.js
--- a/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-32-of-32.js
+++ b/js/src/tests/non262/object/15.2.3.6-dictionary-redefinition-32-of-32.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(32, 32);
diff --git a/js/src/tests/non262/object/15.2.3.6-function-length.js b/js/src/tests/non262/object/15.2.3.6-function-length.js
--- a/js/src/tests/non262/object/15.2.3.6-function-length.js
+++ b/js/src/tests/non262/object/15.2.3.6-function-length.js
@@ -3,17 +3,17 @@
 // http://creativecommons.org/licenses/publicdomain/
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 430133;
 var summary = 'ES5 Object.defineProperty(O, P, Attributes): Function.length';
 
 print(BUGNUMBER + ": " + summary);
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 
 /**************
  * BEGIN TEST *
  **************/
 
 try
 {
   new TestRunner().runFunctionLengthTests();
diff --git a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-1-of-8.js b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-1-of-8.js
--- a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-1-of-8.js
+++ b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-1-of-8.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(1, 8);
diff --git a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-2-of-8.js b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-2-of-8.js
--- a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-2-of-8.js
+++ b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-2-of-8.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(2, 8);
diff --git a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-3-of-8.js b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-3-of-8.js
--- a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-3-of-8.js
+++ b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-3-of-8.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(3, 8);
diff --git a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-4-of-8.js b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-4-of-8.js
--- a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-4-of-8.js
+++ b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-4-of-8.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(4, 8);
diff --git a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-5-of-8.js b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-5-of-8.js
--- a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-5-of-8.js
+++ b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-5-of-8.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(5, 8);
diff --git a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-6-of-8.js b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-6-of-8.js
--- a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-6-of-8.js
+++ b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-6-of-8.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(6, 8);
diff --git a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-7-of-8.js b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-7-of-8.js
--- a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-7-of-8.js
+++ b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-7-of-8.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(7, 8);
diff --git a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-8-of-8.js b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-8-of-8.js
--- a/js/src/tests/non262/object/15.2.3.6-middle-redefinition-8-of-8.js
+++ b/js/src/tests/non262/object/15.2.3.6-middle-redefinition-8-of-8.js
@@ -1,6 +1,6 @@
 // |reftest| slow skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(8, 8);
diff --git a/js/src/tests/non262/object/15.2.3.6-new-definition.js b/js/src/tests/non262/object/15.2.3.6-new-definition.js
--- a/js/src/tests/non262/object/15.2.3.6-new-definition.js
+++ b/js/src/tests/non262/object/15.2.3.6-new-definition.js
@@ -3,17 +3,17 @@
 // http://creativecommons.org/licenses/publicdomain/
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 430133;
 var summary = 'ES5 Object.defineProperty(O, P, Attributes): new definition';
 
 print(BUGNUMBER + ": " + summary);
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 
 /**************
  * BEGIN TEST *
  **************/
 
 try
 {
   new TestRunner().runNotPresentTests();
diff --git a/js/src/tests/non262/object/15.2.3.6-redefinition-1-of-4.js b/js/src/tests/non262/object/15.2.3.6-redefinition-1-of-4.js
--- a/js/src/tests/non262/object/15.2.3.6-redefinition-1-of-4.js
+++ b/js/src/tests/non262/object/15.2.3.6-redefinition-1-of-4.js
@@ -7,17 +7,17 @@ var PART = 1, PARTS = 4;
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 430133;
 var summary =
   'ES5 Object.defineProperty(O, P, Attributes): redefinition ' +
   PART + ' of ' + PARTS;
 
 print(BUGNUMBER + ": " + summary);
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 
 /**************
  * BEGIN TEST *
  **************/
 
 try
 {
   new TestRunner().runPropertyPresentTestsFraction(PART, PARTS);
diff --git a/js/src/tests/non262/object/15.2.3.6-redefinition-2-of-4.js b/js/src/tests/non262/object/15.2.3.6-redefinition-2-of-4.js
--- a/js/src/tests/non262/object/15.2.3.6-redefinition-2-of-4.js
+++ b/js/src/tests/non262/object/15.2.3.6-redefinition-2-of-4.js
@@ -7,17 +7,17 @@ var PART = 2, PARTS = 4;
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 430133;
 var summary =
   'ES5 Object.defineProperty(O, P, Attributes): redefinition ' +
   PART + ' of ' + PARTS;
 
 print(BUGNUMBER + ": " + summary);
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 
 /**************
  * BEGIN TEST *
  **************/
 
 try
 {
   new TestRunner().runPropertyPresentTestsFraction(PART, PARTS);
diff --git a/js/src/tests/non262/object/15.2.3.6-redefinition-3-of-4.js b/js/src/tests/non262/object/15.2.3.6-redefinition-3-of-4.js
--- a/js/src/tests/non262/object/15.2.3.6-redefinition-3-of-4.js
+++ b/js/src/tests/non262/object/15.2.3.6-redefinition-3-of-4.js
@@ -7,17 +7,17 @@ var PART = 3, PARTS = 4;
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 430133;
 var summary =
   'ES5 Object.defineProperty(O, P, Attributes): redefinition ' +
   PART + ' of ' + PARTS;
 
 print(BUGNUMBER + ": " + summary);
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 
 /**************
  * BEGIN TEST *
  **************/
 
 try
 {
   new TestRunner().runPropertyPresentTestsFraction(PART, PARTS);
diff --git a/js/src/tests/non262/object/15.2.3.6-redefinition-4-of-4.js b/js/src/tests/non262/object/15.2.3.6-redefinition-4-of-4.js
--- a/js/src/tests/non262/object/15.2.3.6-redefinition-4-of-4.js
+++ b/js/src/tests/non262/object/15.2.3.6-redefinition-4-of-4.js
@@ -7,17 +7,17 @@ var PART = 4, PARTS = 4;
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 430133;
 var summary =
   'ES5 Object.defineProperty(O, P, Attributes): redefinition ' +
   PART + ' of ' + PARTS;
 
 print(BUGNUMBER + ": " + summary);
 
-load("ecma_5/Object/defineProperty-setup.js");
+loadRelativeToScript("defineProperty-setup.js");
 
 /**************
  * BEGIN TEST *
  **************/
 
 try
 {
   new TestRunner().runPropertyPresentTestsFraction(PART, PARTS);
