diff --git a/build.xml b/build.xml
index cab8bd8cd2b..d1a436fe0ca 100644
--- a/build.xml
+++ b/build.xml
@@ -241,7 +241,7 @@
             debug="false"
             output="${kotlin-home}/lib/kotlin.js" >
 
-          <sources dir="${basedir}/js/js.translator/testFiles">
+          <sources dir="${basedir}/js/js.translator/testData">
             <file name="kotlin_lib_ecma5.js"/>
             <file name="kotlin_lib.js"/>
             <file name="maps.js"/>
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java b/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
index c05ff0f0d9f..c03a9eba004 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
@@ -44,7 +44,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
     protected static final Iterable<EcmaVersion> DEFAULT_ECMA_VERSIONS = Lists.newArrayList(EcmaVersion.v5);
 
     private static final boolean DELETE_OUT = false;
-    private static final String TEST_FILES = "js/js.translator/testFiles/";
+    private static final String TEST_FILES = "js/js.translator/testData/";
     private static final String CASES = "cases/";
     private static final String OUT = "out/";
     private static final String EXPECTED = "expected/";
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibJsArrayQUnitTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibJsArrayQUnitTest.java
index 33bb730c5bb..76e53ad9e44 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibJsArrayQUnitTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibJsArrayQUnitTest.java
@@ -23,7 +23,7 @@ public class StdLibJsArrayQUnitTest extends StdLibQUnitTestSupport {
     }
 
     // TODO for some reason this test fails when ran as part of all the js-backend tests, but works stand alone
-    // generates: ReferenceError: "QUnit" is not defined. (js/js.translator/testFiles/stdlib/out/ArrayQUnitTest.compiler_v3.js#3058)
+    // generates: ReferenceError: "QUnit" is not defined. (js/js.translator/testData/stdlib/out/ArrayQUnitTest.compiler_v3.js#3058)
     // when ran in batch
 
     public void DISABLED_testArrayQUnitTest() throws Exception {
diff --git a/js/js.translator/qunit/index.html b/js/js.translator/qunit/index.html
index e8693e61de5..d0a47cbf31f 100644
--- a/js/js.translator/qunit/index.html
+++ b/js/js.translator/qunit/index.html
@@ -6,9 +6,9 @@
 	<link rel="stylesheet" href="qunit.css">
 	<script src="qunit.js"></script>
 
-        <script src="../testFiles/kotlin_lib_ecma5.js"></script>
-	<script src="../testFiles/kotlin_lib.js"></script>
-	<script src="../testFiles/kotlin-js-library/out/GenerateTestCase.compiler_v5.js"></script>
+        <script src="../testData/kotlin_lib_ecma5.js"></script>
+	<script src="../testData/kotlin_lib.js"></script>
+	<script src="../testData/kotlin-js-library/out/GenerateTestCase.compiler_v5.js"></script>
 
 	<script src="deepEqual.js"></script>
 	<script src="swarminject.js"></script>
diff --git a/libraries/tools/kotlin-js-library/pom.xml b/libraries/tools/kotlin-js-library/pom.xml
index b696a82df74..c4e3eb2ac8e 100644
--- a/libraries/tools/kotlin-js-library/pom.xml
+++ b/libraries/tools/kotlin-js-library/pom.xml
@@ -84,11 +84,11 @@
                                     </fileset>
                                 </copy>
                                 <copy tofile="${basedir}/target/generated-js-library/kotlin-maps.js"
-                                      file="${kotlin-js-lib-srcdir}/../../js.translator/testFiles/maps.js"/>
+                                      file="${kotlin-js-lib-srcdir}/../../js.translator/testData/maps.js"/>
                                 <copy tofile="${basedir}/target/generated-js-library/kotlin-lib.js"
-                                      file="${kotlin-js-lib-srcdir}/../../js.translator/testFiles/kotlin_lib.js"/>
+                                      file="${kotlin-js-lib-srcdir}/../../js.translator/testData/kotlin_lib.js"/>
                                <copy tofile="${basedir}/target/generated-js-library/kotlin-lib-ecma5.js"
-                                      file="${kotlin-js-lib-srcdir}/../../js.translator/testFiles/kotlin_lib_ecma5.js"/>
+                                      file="${kotlin-js-lib-srcdir}/../../js.translator/testData/kotlin_lib_ecma5.js"/>
                             </target>
                         </configuration>
                         <goals>