diff --git a/dev/JSTestRunner.php b/dev/JSTestRunner.php
index 1413a019c..6d3acb85e 100644
--- a/dev/JSTestRunner.php
+++ b/dev/JSTestRunner.php
@@ -149,7 +149,7 @@ class JSTestRunner extends Controller {
 				continue;
 			}
 
-			$testDir = "$baseDir/$moduleFileOrFolder/javascript/tests";
+			$testDir = "$baseDir/$moduleFileOrFolder/tests/javascript";
 			if(@is_dir($testDir)) {
 				$tests = scandir($testDir);
 				foreach($tests as $testFile) {
diff --git a/javascript/tests/i18nTest.html b/tests/javascript/i18nTest.html
similarity index 100%
rename from javascript/tests/i18nTest.html
rename to tests/javascript/i18nTest.html