diff --git a/test/js2tests/__init__.py b/test/jstests/__init__.py
similarity index 100%
rename from test/js2tests/__init__.py
rename to test/jstests/__init__.py
diff --git a/test/js2tests/array_access.py b/test/jstests/array_access.py
similarity index 100%
rename from test/js2tests/array_access.py
rename to test/jstests/array_access.py
diff --git a/test/js2tests/assignments.py b/test/jstests/assignments.py
similarity index 100%
rename from test/js2tests/assignments.py
rename to test/jstests/assignments.py
diff --git a/test/js2tests/basic.py b/test/jstests/basic.py
similarity index 100%
rename from test/js2tests/basic.py
rename to test/jstests/basic.py
diff --git a/test/js2tests/branch.py b/test/jstests/branch.py
similarity index 100%
rename from test/js2tests/branch.py
rename to test/jstests/branch.py
diff --git a/test/js2tests/calc.py b/test/jstests/calc.py
similarity index 100%
rename from test/js2tests/calc.py
rename to test/jstests/calc.py
diff --git a/test/js2tests/call.py b/test/jstests/call.py
similarity index 100%
rename from test/js2tests/call.py
rename to test/jstests/call.py
diff --git a/test/js2tests/comments.py b/test/jstests/comments.py
similarity index 100%
rename from test/js2tests/comments.py
rename to test/jstests/comments.py
diff --git a/test/js2tests/debug.py b/test/jstests/debug.py
similarity index 100%
rename from test/js2tests/debug.py
rename to test/jstests/debug.py
diff --git a/test/js2tests/do_loop.py b/test/jstests/do_loop.py
similarity index 100%
rename from test/js2tests/do_loop.py
rename to test/jstests/do_loop.py
diff --git a/test/js2tests/empty_return.py b/test/jstests/empty_return.py
similarity index 100%
rename from test/js2tests/empty_return.py
rename to test/jstests/empty_return.py
diff --git a/test/js2tests/for_empty.py b/test/jstests/for_empty.py
similarity index 100%
rename from test/js2tests/for_empty.py
rename to test/jstests/for_empty.py
diff --git a/test/js2tests/for_in.py b/test/jstests/for_in.py
similarity index 100%
rename from test/js2tests/for_in.py
rename to test/jstests/for_in.py
diff --git a/test/js2tests/for_loop.py b/test/jstests/for_loop.py
similarity index 100%
rename from test/js2tests/for_loop.py
rename to test/jstests/for_loop.py
diff --git a/test/js2tests/func_expr.py b/test/jstests/func_expr.py
similarity index 100%
rename from test/js2tests/func_expr.py
rename to test/jstests/func_expr.py
diff --git a/test/js2tests/getfield.py b/test/jstests/getfield.py
similarity index 100%
rename from test/js2tests/getfield.py
rename to test/jstests/getfield.py
diff --git a/test/js2tests/label.py b/test/jstests/label.py
similarity index 100%
rename from test/js2tests/label.py
rename to test/jstests/label.py
diff --git a/test/js2tests/morespace.py b/test/jstests/morespace.py
similarity index 100%
rename from test/js2tests/morespace.py
rename to test/jstests/morespace.py
diff --git a/test/js2tests/object_literal.py b/test/jstests/object_literal.py
similarity index 100%
rename from test/js2tests/object_literal.py
rename to test/jstests/object_literal.py
diff --git a/test/js2tests/operators.py b/test/jstests/operators.py
similarity index 100%
rename from test/js2tests/operators.py
rename to test/jstests/operators.py
diff --git a/test/js2tests/parens.py b/test/jstests/parens.py
similarity index 100%
rename from test/js2tests/parens.py
rename to test/jstests/parens.py
diff --git a/test/js2tests/precedence.py b/test/jstests/precedence.py
similarity index 100%
rename from test/js2tests/precedence.py
rename to test/jstests/precedence.py
diff --git a/test/js2tests/strange_chars.py b/test/jstests/strange_chars.py
similarity index 100%
rename from test/js2tests/strange_chars.py
rename to test/jstests/strange_chars.py
diff --git a/test/js2tests/stringprototype.py b/test/jstests/stringprototype.py
similarity index 100%
rename from test/js2tests/stringprototype.py
rename to test/jstests/stringprototype.py
diff --git a/test/js2tests/switch.py b/test/jstests/switch.py
similarity index 100%
rename from test/js2tests/switch.py
rename to test/jstests/switch.py
diff --git a/test/js2tests/try_statement.py b/test/jstests/try_statement.py
similarity index 100%
rename from test/js2tests/try_statement.py
rename to test/jstests/try_statement.py
diff --git a/test/js2tests/unary.py b/test/jstests/unary.py
similarity index 100%
rename from test/js2tests/unary.py
rename to test/jstests/unary.py
diff --git a/test/js2tests/unshift.py b/test/jstests/unshift.py
similarity index 100%
rename from test/js2tests/unshift.py
rename to test/jstests/unshift.py
diff --git a/test/js2tests/while_loop.py b/test/jstests/while_loop.py
similarity index 100%
rename from test/js2tests/while_loop.py
rename to test/jstests/while_loop.py
diff --git a/test/js2tests/with_statement.py b/test/jstests/with_statement.py
similarity index 100%
rename from test/js2tests/with_statement.py
rename to test/jstests/with_statement.py
diff --git a/test/test_jsinterp.py b/test/test_jsinterp.py
index 070680beb..c24b8ca74 100644
--- a/test/test_jsinterp.py
+++ b/test/test_jsinterp.py
@@ -11,7 +11,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from youtube_dl.jsinterp import JSInterpreter
 
 
-class TestJSInterpreterOrig(unittest.TestCase):
+class TestJSInterpreter(unittest.TestCase):
     def test_basic(self):
         jsi = JSInterpreter('function x(){;}')
         self.assertEqual(jsi.call_function('x'), None)
diff --git a/test/test_js2test_jsinterp2.py b/test/test_jstest_jsinterp2.py
similarity index 97%
rename from test/test_js2test_jsinterp2.py
rename to test/test_jstest_jsinterp2.py
index 060d458e8..308710759 100644
--- a/test/test_js2test_jsinterp2.py
+++ b/test/test_jstest_jsinterp2.py
@@ -14,7 +14,7 @@ else:
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from youtube_dl.jsinterp2 import JSInterpreter
-from .js2tests import gettestcases
+from .jstests import gettestcases
 
 __doc__ = """see: `js2tests`"""
 
@@ -26,7 +26,7 @@ logging.basicConfig(stream=sys.stderr, level=logging.WARNING)
 log = logging.getLogger('TestJSInterpreter2')
 
 
-class TestJSInterpreter2(unittest.TestCase):
+class TestJSTestsJSInterpreter2(unittest.TestCase):
     def setUp(self):
         self.defs = defs
 
diff --git a/test/test_js2test_jsinterp2_parse.py b/test/test_jstest_jsinterp2_parse.py
similarity index 96%
rename from test/test_js2test_jsinterp2_parse.py
rename to test/test_jstest_jsinterp2_parse.py
index fb4199551..da4731f98 100644
--- a/test/test_js2test_jsinterp2_parse.py
+++ b/test/test_jstest_jsinterp2_parse.py
@@ -15,7 +15,7 @@ else:
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from youtube_dl.jsinterp2.jsparser import Parser
-from .js2tests import gettestcases
+from .jstests import gettestcases
 
 __doc__ = """see: `js2tests`"""
 
@@ -39,7 +39,7 @@ logging.basicConfig(stream=sys.stderr, level=logging.WARNING)
 log = logging.getLogger('TestJSInterpreter2Parse')
 
 
-class TestJSInterpreter2Parse(unittest.TestCase):
+class TestJSTestsJSInterpreter2Parse(unittest.TestCase):
     def setUp(self):
         self.defs = defs
 
diff --git a/test/test_js2test_legacy.py b/test/test_jstest_legacy.py
similarity index 97%
rename from test/test_js2test_legacy.py
rename to test/test_jstest_legacy.py
index 3110d7960..8596b1282 100644
--- a/test/test_js2test_legacy.py
+++ b/test/test_jstest_legacy.py
@@ -14,7 +14,7 @@ else:
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from youtube_dl.jsinterp import JSInterpreter
-from .js2tests import gettestcases
+from .jstests import gettestcases
 
 __doc__ = """see: `js2tests`"""
 
@@ -26,7 +26,7 @@ logging.basicConfig(stream=sys.stderr, level=logging.WARNING)
 log = logging.getLogger('TestJSInterpreter')
 
 
-class TestJSInterpreter(unittest.TestCase):
+class TestJSTestsJSInterpreter(unittest.TestCase):
     def setUp(self):
         self.defs = defs