diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java b/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java
index 9ffb9cc3091..58d92809ff7 100644
--- a/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java
+++ b/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java
@@ -57,7 +57,7 @@ public abstract class KotlinIntegrationTestBase {
         @Override
         protected void starting(Description description) {
             final File baseTestDataDir =
-                    new File(getKotlinProjectHome(), "compiler" + File.separator + "integration-tests" + File.separator + "data");
+                    new File(getKotlinProjectHome(), "compiler" + File.separator + "integration-tests" + File.separator + "testData");
             testDataDir = new File(baseTestDataDir, description.getMethodName());
         }
 
diff --git a/compiler/integration-tests/data/antTaskJvm/build.log.expected b/compiler/integration-tests/testData/antTaskJvm/build.log.expected
similarity index 100%
rename from compiler/integration-tests/data/antTaskJvm/build.log.expected
rename to compiler/integration-tests/testData/antTaskJvm/build.log.expected
diff --git a/compiler/integration-tests/data/antTaskJvm/build.xml b/compiler/integration-tests/testData/antTaskJvm/build.xml
similarity index 100%
rename from compiler/integration-tests/data/antTaskJvm/build.xml
rename to compiler/integration-tests/testData/antTaskJvm/build.xml
diff --git a/compiler/integration-tests/data/antTaskJvm/hello.kt b/compiler/integration-tests/testData/antTaskJvm/hello.kt
similarity index 100%
rename from compiler/integration-tests/data/antTaskJvm/hello.kt
rename to compiler/integration-tests/testData/antTaskJvm/hello.kt
diff --git a/compiler/integration-tests/data/antTaskJvm/hello.run.expected b/compiler/integration-tests/testData/antTaskJvm/hello.run.expected
similarity index 100%
rename from compiler/integration-tests/data/antTaskJvm/hello.run.expected
rename to compiler/integration-tests/testData/antTaskJvm/hello.run.expected
diff --git a/compiler/integration-tests/data/compilationFailed/hello.compile.expected b/compiler/integration-tests/testData/compilationFailed/hello.compile.expected
similarity index 100%
rename from compiler/integration-tests/data/compilationFailed/hello.compile.expected
rename to compiler/integration-tests/testData/compilationFailed/hello.compile.expected
diff --git a/compiler/integration-tests/data/compilationFailed/hello.kt b/compiler/integration-tests/testData/compilationFailed/hello.kt
similarity index 100%
rename from compiler/integration-tests/data/compilationFailed/hello.kt
rename to compiler/integration-tests/testData/compilationFailed/hello.kt
diff --git a/compiler/integration-tests/data/compileAndRunHelloApp/hello.compile.expected b/compiler/integration-tests/testData/compileAndRunHelloApp/hello.compile.expected
similarity index 100%
rename from compiler/integration-tests/data/compileAndRunHelloApp/hello.compile.expected
rename to compiler/integration-tests/testData/compileAndRunHelloApp/hello.compile.expected
diff --git a/compiler/integration-tests/data/compileAndRunHelloApp/hello.kt b/compiler/integration-tests/testData/compileAndRunHelloApp/hello.kt
similarity index 100%
rename from compiler/integration-tests/data/compileAndRunHelloApp/hello.kt
rename to compiler/integration-tests/testData/compileAndRunHelloApp/hello.kt
diff --git a/compiler/integration-tests/data/compileAndRunHelloApp/hello.run.expected b/compiler/integration-tests/testData/compileAndRunHelloApp/hello.run.expected
similarity index 100%
rename from compiler/integration-tests/data/compileAndRunHelloApp/hello.run.expected
rename to compiler/integration-tests/testData/compileAndRunHelloApp/hello.run.expected
diff --git a/compiler/integration-tests/data/compileAndRunModule/Smoke.compile.expected b/compiler/integration-tests/testData/compileAndRunModule/Smoke.compile.expected
similarity index 100%
rename from compiler/integration-tests/data/compileAndRunModule/Smoke.compile.expected
rename to compiler/integration-tests/testData/compileAndRunModule/Smoke.compile.expected
diff --git a/compiler/integration-tests/data/compileAndRunModule/Smoke.kt b/compiler/integration-tests/testData/compileAndRunModule/Smoke.kt
similarity index 95%
rename from compiler/integration-tests/data/compileAndRunModule/Smoke.kt
rename to compiler/integration-tests/testData/compileAndRunModule/Smoke.kt
index dc2ec6c6eb9..49d0e6db899 100644
--- a/compiler/integration-tests/data/compileAndRunModule/Smoke.kt
+++ b/compiler/integration-tests/testData/compileAndRunModule/Smoke.kt
@@ -1,5 +1,5 @@
-package Smoke
-
-fun main(args: Array<String>) {
-    print("${args[0]}|${args[1]}|${args[2]}")
-}
+package Smoke
+
+fun main(args: Array<String>) {
+    print("${args[0]}|${args[1]}|${args[2]}")
+}
diff --git a/compiler/integration-tests/data/compileAndRunModule/Smoke.kts b/compiler/integration-tests/testData/compileAndRunModule/Smoke.kts
similarity index 93%
rename from compiler/integration-tests/data/compileAndRunModule/Smoke.kts
rename to compiler/integration-tests/testData/compileAndRunModule/Smoke.kts
index da112ebae67..179d700646e 100644
--- a/compiler/integration-tests/data/compileAndRunModule/Smoke.kts
+++ b/compiler/integration-tests/testData/compileAndRunModule/Smoke.kts
@@ -1,7 +1,7 @@
-import kotlin.modules.*
-
-fun project() {
-    module("smoke") {
-        sources += "Smoke.kt"
-    }
-}
+import kotlin.modules.*
+
+fun project() {
+    module("smoke") {
+        sources += "Smoke.kt"
+    }
+}
diff --git a/compiler/integration-tests/data/compileAndRunModule/Smoke.run.expected b/compiler/integration-tests/testData/compileAndRunModule/Smoke.run.expected
similarity index 100%
rename from compiler/integration-tests/data/compileAndRunModule/Smoke.run.expected
rename to compiler/integration-tests/testData/compileAndRunModule/Smoke.run.expected
diff --git a/compiler/integration-tests/data/syntaxErrors/test.compile.expected b/compiler/integration-tests/testData/syntaxErrors/test.compile.expected
similarity index 100%
rename from compiler/integration-tests/data/syntaxErrors/test.compile.expected
rename to compiler/integration-tests/testData/syntaxErrors/test.compile.expected
diff --git a/compiler/integration-tests/data/syntaxErrors/test.kt b/compiler/integration-tests/testData/syntaxErrors/test.kt
similarity index 100%
rename from compiler/integration-tests/data/syntaxErrors/test.kt
rename to compiler/integration-tests/testData/syntaxErrors/test.kt