diff --git a/test/testpy/__init__.py b/test/testpy/__init__.py
index f113c1253a477f..9d1c478f094752 100644
--- a/test/testpy/__init__.py
+++ b/test/testpy/__init__.py
@@ -115,7 +115,7 @@ def ListTests(self, current_path, path, arch, mode):
     all_tests = [current_path + [t] for t in self.Ls(join(self.root))]
     result = []
     for test in all_tests:
-      if self.Contains(path, test):
+      if self.Contains(path, [test[0], re.sub('\.m?js$', '', test[1])]):
         file_path = join(self.root, reduce(join, test[1:], ""))
         test_name = test[:-1] + [splitext(test[-1])[0]]
         result.append(SimpleTestCase(test_name, file_path, arch, mode,