diff --git a/js/src/tests/jstests.py b/js/src/tests/jstests.py
index eaa27af5ff5..79c04a7e61a 100755
--- a/js/src/tests/jstests.py
+++ b/js/src/tests/jstests.py
@@ -8,23 +8,23 @@ See the adjacent README.txt for more details.
 import os, sys
 from subprocess import list2cmdline, call
 
-from results import NullTestOutput
-from tests import TestCase
-from results import ResultsSink
+from lib.results import NullTestOutput
+from lib.tests import TestCase
+from lib.results import ResultsSink
 
 if (sys.platform.startswith('linux') or
     sys.platform.startswith('darwin')
    ):
-    from tasks_unix import run_all_tests
+    from lib.tasks_unix import run_all_tests
 else:
-    from tasks_win import run_all_tests
+    from lib.tasks_win import run_all_tests
 
 def run_tests(options, tests, results):
     """Run the given tests, sending raw results to the given results accumulator."""
     pb = None
     if not options.hide_progress:
         try:
-            from progressbar import ProgressBar
+            from lib.progressbar import ProgressBar
             pb = ProgressBar('', len(tests), 16)
         except ImportError:
             pass
@@ -170,7 +170,7 @@ def load_tests(options, js_shell, requested_paths, excluded_paths):
         skip_list: [iterable<Test>] Tests found but skipped.
         test_list: [iterable<Test>] Tests found that should be run.
     """
-    import manifest
+    import lib.manifest as manifest
 
     if js_shell is None:
         xul_tester = manifest.NullXULInfoTester()
diff --git a/js/src/tests/lib/__init__.py b/js/src/tests/lib/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/js/src/tests/manifest.py b/js/src/tests/lib/manifest.py
similarity index 100%
rename from js/src/tests/manifest.py
rename to js/src/tests/lib/manifest.py
diff --git a/js/src/tests/progressbar.py b/js/src/tests/lib/progressbar.py
similarity index 100%
rename from js/src/tests/progressbar.py
rename to js/src/tests/lib/progressbar.py
diff --git a/js/src/tests/results.py b/js/src/tests/lib/results.py
similarity index 100%
rename from js/src/tests/results.py
rename to js/src/tests/lib/results.py
diff --git a/js/src/tests/tasks_unix.py b/js/src/tests/lib/tasks_unix.py
similarity index 100%
rename from js/src/tests/tasks_unix.py
rename to js/src/tests/lib/tasks_unix.py
diff --git a/js/src/tests/tasks_win.py b/js/src/tests/lib/tasks_win.py
similarity index 100%
rename from js/src/tests/tasks_win.py
rename to js/src/tests/lib/tasks_win.py
diff --git a/js/src/tests/tests.py b/js/src/tests/lib/tests.py
similarity index 100%
rename from js/src/tests/tests.py
rename to js/src/tests/lib/tests.py