diff --git a/.idea/modules.xml b/.idea/modules.xml
index 4041c5811dc..1ab9c8b3ebc 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -13,7 +13,6 @@
       <module fileurl="file://$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" filepath="$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli.iml" filepath="$PROJECT_DIR$/compiler/cli/cli.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" filepath="$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" group="compiler/cli" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/integration-tests/compiler-integration-tests.iml" filepath="$PROJECT_DIR$/compiler/integration-tests/compiler-integration-tests.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/compiler/tests/compiler-tests.iml" filepath="$PROJECT_DIR$/compiler/tests/compiler-tests.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" filepath="$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/descriptors/descriptors.iml" filepath="$PROJECT_DIR$/core/descriptors/descriptors.iml" group="core" />
diff --git a/compiler/integration-tests/compiler-integration-tests.iml b/compiler/integration-tests/compiler-integration-tests.iml
deleted file mode 100644
index e9e580dbddd..00000000000
--- a/compiler/integration-tests/compiler-integration-tests.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="compiler-tests" />
-    <orderEntry type="module" module-name="js.tests" scope="TEST" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="cli-common" scope="TEST" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/ReadMe.md b/compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/ReadMe.md
deleted file mode 100644
index 6c269930b08..00000000000
--- a/compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/ReadMe.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# jslib-example
-
-Path to sources: compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example
-
-The archive compiler/integration-tests/testData/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar should be updated after
-changing some files in source folder.
\ No newline at end of file
diff --git a/compiler/testData/cli/js/notValidLibraryDir.args b/compiler/testData/cli/js/notValidLibraryDir.args
index 8919d7856e8..99e4efa12b8 100644
--- a/compiler/testData/cli/js/notValidLibraryDir.args
+++ b/compiler/testData/cli/js/notValidLibraryDir.args
@@ -1,5 +1,5 @@
 $TESTDATA_DIR$/withLib.kt
 -library-files
-compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib
+compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib
 -output
 $TEMP_DIR$/out.js
diff --git a/compiler/testData/cli/js/notValidLibraryDir.out b/compiler/testData/cli/js/notValidLibraryDir.out
index 6b388c9055a..2be5465ccf9 100644
--- a/compiler/testData/cli/js/notValidLibraryDir.out
+++ b/compiler/testData/cli/js/notValidLibraryDir.out
@@ -1,2 +1,2 @@
-ERROR: 'compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib' is not a valid Kotlin Javascript library
+ERROR: 'compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib' is not a valid Kotlin Javascript library
 COMPILATION_ERROR
\ No newline at end of file
diff --git a/compiler/testData/cli/js/withFolderAsLib.args b/compiler/testData/cli/js/withFolderAsLib.args
index 7052021ee8b..cb5c30e6d87 100644
--- a/compiler/testData/cli/js/withFolderAsLib.args
+++ b/compiler/testData/cli/js/withFolderAsLib.args
@@ -1,5 +1,5 @@
 $TESTDATA_DIR$/withLib.kt
 -library-files
-compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example
+compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example
 -output
 $TEMP_DIR$/out.js
diff --git a/compiler/testData/cli/js/withLib.args b/compiler/testData/cli/js/withLib.args
index f9b2ba58947..036a895e7ea 100644
--- a/compiler/testData/cli/js/withLib.args
+++ b/compiler/testData/cli/js/withLib.args
@@ -1,5 +1,5 @@
 $TESTDATA_DIR$/withLib.kt
 -library-files
-compiler/integration-tests/testData/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar
+compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar
 -output
 $TEMP_DIR$/out.js
diff --git a/compiler/integration-tests/testData/ant/js/additionalArguments/build.log.expected b/compiler/testData/integration/ant/js/additionalArguments/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/additionalArguments/build.log.expected
rename to compiler/testData/integration/ant/js/additionalArguments/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/additionalArguments/build.xml b/compiler/testData/integration/ant/js/additionalArguments/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/additionalArguments/build.xml
rename to compiler/testData/integration/ant/js/additionalArguments/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/additionalArguments/hello.kt b/compiler/testData/integration/ant/js/additionalArguments/hello.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/additionalArguments/hello.kt
rename to compiler/testData/integration/ant/js/additionalArguments/hello.kt
diff --git a/compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/build.log.expected b/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/build.log.expected
rename to compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/build.xml b/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/build.xml
rename to compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/postfix b/compiler/testData/integration/ant/js/bothPrefixAndPostfix/postfix
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/postfix
rename to compiler/testData/integration/ant/js/bothPrefixAndPostfix/postfix
diff --git a/compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/prefix b/compiler/testData/integration/ant/js/bothPrefixAndPostfix/prefix
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/prefix
rename to compiler/testData/integration/ant/js/bothPrefixAndPostfix/prefix
diff --git a/compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/root1/foo.kt b/compiler/testData/integration/ant/js/bothPrefixAndPostfix/root1/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/root1/foo.kt
rename to compiler/testData/integration/ant/js/bothPrefixAndPostfix/root1/foo.kt
diff --git a/compiler/integration-tests/testData/ant/js/manySources/bar.kt b/compiler/testData/integration/ant/js/manySources/bar.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/manySources/bar.kt
rename to compiler/testData/integration/ant/js/manySources/bar.kt
diff --git a/compiler/integration-tests/testData/ant/js/manySources/build.log.expected b/compiler/testData/integration/ant/js/manySources/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/manySources/build.log.expected
rename to compiler/testData/integration/ant/js/manySources/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/manySources/build.xml b/compiler/testData/integration/ant/js/manySources/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/manySources/build.xml
rename to compiler/testData/integration/ant/js/manySources/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/manySources/root1/main.kt b/compiler/testData/integration/ant/js/manySources/root1/main.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/manySources/root1/main.kt
rename to compiler/testData/integration/ant/js/manySources/root1/main.kt
diff --git a/compiler/integration-tests/testData/ant/js/manySources/root2/Bar.js b/compiler/testData/integration/ant/js/manySources/root2/Bar.js
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/manySources/root2/Bar.js
rename to compiler/testData/integration/ant/js/manySources/root2/Bar.js
diff --git a/compiler/integration-tests/testData/ant/js/manySources/root2/Foo.kt b/compiler/testData/integration/ant/js/manySources/root2/Foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/manySources/root2/Foo.kt
rename to compiler/testData/integration/ant/js/manySources/root2/Foo.kt
diff --git a/compiler/integration-tests/testData/ant/js/noOutputParam/build.log.expected b/compiler/testData/integration/ant/js/noOutputParam/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/noOutputParam/build.log.expected
rename to compiler/testData/integration/ant/js/noOutputParam/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/noOutputParam/build.xml b/compiler/testData/integration/ant/js/noOutputParam/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/noOutputParam/build.xml
rename to compiler/testData/integration/ant/js/noOutputParam/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/noSrcParam/build.log.expected b/compiler/testData/integration/ant/js/noSrcParam/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/noSrcParam/build.log.expected
rename to compiler/testData/integration/ant/js/noSrcParam/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/noSrcParam/build.xml b/compiler/testData/integration/ant/js/noSrcParam/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/noSrcParam/build.xml
rename to compiler/testData/integration/ant/js/noSrcParam/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/outputPostfix/build.log.expected b/compiler/testData/integration/ant/js/outputPostfix/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/outputPostfix/build.log.expected
rename to compiler/testData/integration/ant/js/outputPostfix/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/outputPostfix/build.xml b/compiler/testData/integration/ant/js/outputPostfix/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/outputPostfix/build.xml
rename to compiler/testData/integration/ant/js/outputPostfix/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/outputPostfix/postfix b/compiler/testData/integration/ant/js/outputPostfix/postfix
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/outputPostfix/postfix
rename to compiler/testData/integration/ant/js/outputPostfix/postfix
diff --git a/compiler/integration-tests/testData/ant/js/outputPostfix/root1/foo.kt b/compiler/testData/integration/ant/js/outputPostfix/root1/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/outputPostfix/root1/foo.kt
rename to compiler/testData/integration/ant/js/outputPostfix/root1/foo.kt
diff --git a/compiler/integration-tests/testData/ant/js/outputPrefix/build.log.expected b/compiler/testData/integration/ant/js/outputPrefix/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/outputPrefix/build.log.expected
rename to compiler/testData/integration/ant/js/outputPrefix/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/outputPrefix/build.xml b/compiler/testData/integration/ant/js/outputPrefix/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/outputPrefix/build.xml
rename to compiler/testData/integration/ant/js/outputPrefix/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/outputPrefix/prefix b/compiler/testData/integration/ant/js/outputPrefix/prefix
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/outputPrefix/prefix
rename to compiler/testData/integration/ant/js/outputPrefix/prefix
diff --git a/compiler/integration-tests/testData/ant/js/outputPrefix/root1/foo.kt b/compiler/testData/integration/ant/js/outputPrefix/root1/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/outputPrefix/root1/foo.kt
rename to compiler/testData/integration/ant/js/outputPrefix/root1/foo.kt
diff --git a/compiler/integration-tests/testData/ant/js/outputWithoutDirectory/build.log.expected b/compiler/testData/integration/ant/js/outputWithoutDirectory/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/outputWithoutDirectory/build.log.expected
rename to compiler/testData/integration/ant/js/outputWithoutDirectory/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/outputWithoutDirectory/build.xml b/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/outputWithoutDirectory/build.xml
rename to compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/outputWithoutDirectory/root1/foo.kt b/compiler/testData/integration/ant/js/outputWithoutDirectory/root1/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/outputWithoutDirectory/root1/foo.kt
rename to compiler/testData/integration/ant/js/outputWithoutDirectory/root1/foo.kt
diff --git a/compiler/integration-tests/testData/ant/js/simple/build.log.expected b/compiler/testData/integration/ant/js/simple/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simple/build.log.expected
rename to compiler/testData/integration/ant/js/simple/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/simple/build.xml b/compiler/testData/integration/ant/js/simple/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simple/build.xml
rename to compiler/testData/integration/ant/js/simple/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/simple/root1/foo.kt b/compiler/testData/integration/ant/js/simple/root1/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simple/root1/foo.kt
rename to compiler/testData/integration/ant/js/simple/root1/foo.kt
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithMain/build.log.expected b/compiler/testData/integration/ant/js/simpleWithMain/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithMain/build.log.expected
rename to compiler/testData/integration/ant/js/simpleWithMain/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithMain/build.xml b/compiler/testData/integration/ant/js/simpleWithMain/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithMain/build.xml
rename to compiler/testData/integration/ant/js/simpleWithMain/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithMain/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithMain/root1/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithMain/root1/foo.kt
rename to compiler/testData/integration/ant/js/simpleWithMain/root1/foo.kt
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithMainFQArgs/build.log.expected b/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithMainFQArgs/build.log.expected
rename to compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithMainFQArgs/build.xml b/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithMainFQArgs/build.xml
rename to compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithMainFQArgs/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithMainFQArgs/root1/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithMainFQArgs/root1/foo.kt
rename to compiler/testData/integration/ant/js/simpleWithMainFQArgs/root1/foo.kt
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithStdlib/build.log.expected b/compiler/testData/integration/ant/js/simpleWithStdlib/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithStdlib/build.log.expected
rename to compiler/testData/integration/ant/js/simpleWithStdlib/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithStdlib/build.xml b/compiler/testData/integration/ant/js/simpleWithStdlib/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithStdlib/build.xml
rename to compiler/testData/integration/ant/js/simpleWithStdlib/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithStdlib/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithStdlib/root1/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithStdlib/root1/foo.kt
rename to compiler/testData/integration/ant/js/simpleWithStdlib/root1/foo.kt
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithStdlibAndAnotherLib/build.log.expected b/compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithStdlibAndAnotherLib/build.log.expected
rename to compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithStdlibAndAnotherLib/build.xml b/compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithStdlibAndAnotherLib/build.xml
rename to compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar b/compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar
rename to compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithStdlibAndAnotherLib/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/root1/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithStdlibAndAnotherLib/root1/foo.kt
rename to compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/root1/foo.kt
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/build.log.expected b/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/build.log.expected
rename to compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/build.xml b/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/build.xml
rename to compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/LibraryExample.kt b/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/LibraryExample.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/LibraryExample.kt
rename to compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/LibraryExample.kt
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/META-INF/MANIFEST.MF b/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/META-INF/MANIFEST.MF
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/META-INF/MANIFEST.MF
rename to compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/META-INF/MANIFEST.MF
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/ReadMe.md b/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/ReadMe.md
new file mode 100644
index 00000000000..714dece829f
--- /dev/null
+++ b/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/ReadMe.md
@@ -0,0 +1,6 @@
+# jslib-example
+
+Path to sources: compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example
+
+The archive compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar should be updated after
+changing some files in source folder.
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/jslib-example.js b/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/jslib-example.js
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/jslib-example.js
rename to compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example/jslib-example.js
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/root1/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/root1/foo.kt
rename to compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/root1/foo.kt
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithVarargMain/build.log.expected b/compiler/testData/integration/ant/js/simpleWithVarargMain/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithVarargMain/build.log.expected
rename to compiler/testData/integration/ant/js/simpleWithVarargMain/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithVarargMain/build.xml b/compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithVarargMain/build.xml
rename to compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/simpleWithVarargMain/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithVarargMain/root1/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/simpleWithVarargMain/root1/foo.kt
rename to compiler/testData/integration/ant/js/simpleWithVarargMain/root1/foo.kt
diff --git a/compiler/integration-tests/testData/ant/js/sourcemap/build.log.expected b/compiler/testData/integration/ant/js/sourcemap/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/sourcemap/build.log.expected
rename to compiler/testData/integration/ant/js/sourcemap/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/sourcemap/build.xml b/compiler/testData/integration/ant/js/sourcemap/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/sourcemap/build.xml
rename to compiler/testData/integration/ant/js/sourcemap/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/sourcemap/root1/foo.kt b/compiler/testData/integration/ant/js/sourcemap/root1/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/sourcemap/root1/foo.kt
rename to compiler/testData/integration/ant/js/sourcemap/root1/foo.kt
diff --git a/compiler/integration-tests/testData/ant/js/suppressWarnings/build.log.expected b/compiler/testData/integration/ant/js/suppressWarnings/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/suppressWarnings/build.log.expected
rename to compiler/testData/integration/ant/js/suppressWarnings/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/suppressWarnings/build.xml b/compiler/testData/integration/ant/js/suppressWarnings/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/suppressWarnings/build.xml
rename to compiler/testData/integration/ant/js/suppressWarnings/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/suppressWarnings/root1/foo.kt b/compiler/testData/integration/ant/js/suppressWarnings/root1/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/suppressWarnings/root1/foo.kt
rename to compiler/testData/integration/ant/js/suppressWarnings/root1/foo.kt
diff --git a/compiler/integration-tests/testData/ant/js/verbose/build.log.expected b/compiler/testData/integration/ant/js/verbose/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/verbose/build.log.expected
rename to compiler/testData/integration/ant/js/verbose/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/verbose/build.xml b/compiler/testData/integration/ant/js/verbose/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/verbose/build.xml
rename to compiler/testData/integration/ant/js/verbose/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/verbose/root1/foo.kt b/compiler/testData/integration/ant/js/verbose/root1/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/verbose/root1/foo.kt
rename to compiler/testData/integration/ant/js/verbose/root1/foo.kt
diff --git a/compiler/integration-tests/testData/ant/js/version/build.log.expected b/compiler/testData/integration/ant/js/version/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/version/build.log.expected
rename to compiler/testData/integration/ant/js/version/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/js/version/build.xml b/compiler/testData/integration/ant/js/version/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/version/build.xml
rename to compiler/testData/integration/ant/js/version/build.xml
diff --git a/compiler/integration-tests/testData/ant/js/version/root1/foo.kt b/compiler/testData/integration/ant/js/version/root1/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/js/version/root1/foo.kt
rename to compiler/testData/integration/ant/js/version/root1/foo.kt
diff --git a/compiler/integration-tests/testData/ant/jvm/additionalArguments/build.log.expected b/compiler/testData/integration/ant/jvm/additionalArguments/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/additionalArguments/build.log.expected
rename to compiler/testData/integration/ant/jvm/additionalArguments/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/additionalArguments/build.xml b/compiler/testData/integration/ant/jvm/additionalArguments/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/additionalArguments/build.xml
rename to compiler/testData/integration/ant/jvm/additionalArguments/build.xml
diff --git a/compiler/integration-tests/testData/ant/jvm/additionalArguments/hello.kt b/compiler/testData/integration/ant/jvm/additionalArguments/hello.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/additionalArguments/hello.kt
rename to compiler/testData/integration/ant/jvm/additionalArguments/hello.kt
diff --git a/compiler/integration-tests/testData/ant/jvm/additionalArguments/hello.run.expected b/compiler/testData/integration/ant/jvm/additionalArguments/hello.run.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/additionalArguments/hello.run.expected
rename to compiler/testData/integration/ant/jvm/additionalArguments/hello.run.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/externalAnnotations/build.log.expected b/compiler/testData/integration/ant/jvm/externalAnnotations/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/externalAnnotations/build.log.expected
rename to compiler/testData/integration/ant/jvm/externalAnnotations/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/externalAnnotations/build.xml b/compiler/testData/integration/ant/jvm/externalAnnotations/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/externalAnnotations/build.xml
rename to compiler/testData/integration/ant/jvm/externalAnnotations/build.xml
diff --git a/compiler/integration-tests/testData/ant/jvm/externalAnnotations/hello.run.expected b/compiler/testData/integration/ant/jvm/externalAnnotations/hello.run.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/externalAnnotations/hello.run.expected
rename to compiler/testData/integration/ant/jvm/externalAnnotations/hello.run.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/a/j/annotations.xml b/compiler/testData/integration/ant/jvm/externalAnnotations/root1/a/j/annotations.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/a/j/annotations.xml
rename to compiler/testData/integration/ant/jvm/externalAnnotations/root1/a/j/annotations.xml
diff --git a/compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/b/j/annotations.xml b/compiler/testData/integration/ant/jvm/externalAnnotations/root1/b/j/annotations.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/b/j/annotations.xml
rename to compiler/testData/integration/ant/jvm/externalAnnotations/root1/b/j/annotations.xml
diff --git a/compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/hello.kt b/compiler/testData/integration/ant/jvm/externalAnnotations/root1/hello.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/hello.kt
rename to compiler/testData/integration/ant/jvm/externalAnnotations/root1/hello.kt
diff --git a/compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/j/Java.java b/compiler/testData/integration/ant/jvm/externalAnnotations/root1/j/Java.java
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/j/Java.java
rename to compiler/testData/integration/ant/jvm/externalAnnotations/root1/j/Java.java
diff --git a/compiler/integration-tests/testData/ant/jvm/helloWorld/build.log.expected b/compiler/testData/integration/ant/jvm/helloWorld/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/helloWorld/build.log.expected
rename to compiler/testData/integration/ant/jvm/helloWorld/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/helloWorld/build.xml b/compiler/testData/integration/ant/jvm/helloWorld/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/helloWorld/build.xml
rename to compiler/testData/integration/ant/jvm/helloWorld/build.xml
diff --git a/compiler/integration-tests/testData/ant/jvm/helloWorld/hello.kt b/compiler/testData/integration/ant/jvm/helloWorld/hello.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/helloWorld/hello.kt
rename to compiler/testData/integration/ant/jvm/helloWorld/hello.kt
diff --git a/compiler/integration-tests/testData/ant/jvm/helloWorld/hello.run.expected b/compiler/testData/integration/ant/jvm/helloWorld/hello.run.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/helloWorld/hello.run.expected
rename to compiler/testData/integration/ant/jvm/helloWorld/hello.run.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/javacCompiler/build.log.expected b/compiler/testData/integration/ant/jvm/javacCompiler/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/javacCompiler/build.log.expected
rename to compiler/testData/integration/ant/jvm/javacCompiler/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/javacCompiler/build.xml b/compiler/testData/integration/ant/jvm/javacCompiler/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/javacCompiler/build.xml
rename to compiler/testData/integration/ant/jvm/javacCompiler/build.xml
diff --git a/compiler/integration-tests/testData/ant/jvm/javacCompiler/hello.run.expected b/compiler/testData/integration/ant/jvm/javacCompiler/hello.run.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/javacCompiler/hello.run.expected
rename to compiler/testData/integration/ant/jvm/javacCompiler/hello.run.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/javacCompiler/root1/hello.kt b/compiler/testData/integration/ant/jvm/javacCompiler/root1/hello.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/javacCompiler/root1/hello.kt
rename to compiler/testData/integration/ant/jvm/javacCompiler/root1/hello.kt
diff --git a/compiler/integration-tests/testData/ant/jvm/javacCompiler/root1/j/Java.java b/compiler/testData/integration/ant/jvm/javacCompiler/root1/j/Java.java
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/javacCompiler/root1/j/Java.java
rename to compiler/testData/integration/ant/jvm/javacCompiler/root1/j/Java.java
diff --git a/compiler/integration-tests/testData/ant/jvm/jvmClasspath/build.log.expected b/compiler/testData/integration/ant/jvm/jvmClasspath/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/jvmClasspath/build.log.expected
rename to compiler/testData/integration/ant/jvm/jvmClasspath/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/jvmClasspath/build.xml b/compiler/testData/integration/ant/jvm/jvmClasspath/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/jvmClasspath/build.xml
rename to compiler/testData/integration/ant/jvm/jvmClasspath/build.xml
diff --git a/compiler/integration-tests/testData/ant/jvm/jvmClasspath/hello.kt b/compiler/testData/integration/ant/jvm/jvmClasspath/hello.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/jvmClasspath/hello.kt
rename to compiler/testData/integration/ant/jvm/jvmClasspath/hello.kt
diff --git a/compiler/integration-tests/testData/ant/jvm/jvmClasspath/hello.run.expected b/compiler/testData/integration/ant/jvm/jvmClasspath/hello.run.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/jvmClasspath/hello.run.expected
rename to compiler/testData/integration/ant/jvm/jvmClasspath/hello.run.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/kotlinCompiler/build.log.expected b/compiler/testData/integration/ant/jvm/kotlinCompiler/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/kotlinCompiler/build.log.expected
rename to compiler/testData/integration/ant/jvm/kotlinCompiler/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/kotlinCompiler/build.xml b/compiler/testData/integration/ant/jvm/kotlinCompiler/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/kotlinCompiler/build.xml
rename to compiler/testData/integration/ant/jvm/kotlinCompiler/build.xml
diff --git a/compiler/integration-tests/testData/ant/jvm/kotlinCompiler/hello.run.expected b/compiler/testData/integration/ant/jvm/kotlinCompiler/hello.run.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/kotlinCompiler/hello.run.expected
rename to compiler/testData/integration/ant/jvm/kotlinCompiler/hello.run.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/a/j/annotations.xml b/compiler/testData/integration/ant/jvm/kotlinCompiler/root1/a/j/annotations.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/a/j/annotations.xml
rename to compiler/testData/integration/ant/jvm/kotlinCompiler/root1/a/j/annotations.xml
diff --git a/compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/b/j/annotations.xml b/compiler/testData/integration/ant/jvm/kotlinCompiler/root1/b/j/annotations.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/b/j/annotations.xml
rename to compiler/testData/integration/ant/jvm/kotlinCompiler/root1/b/j/annotations.xml
diff --git a/compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/hello.kt b/compiler/testData/integration/ant/jvm/kotlinCompiler/root1/hello.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/hello.kt
rename to compiler/testData/integration/ant/jvm/kotlinCompiler/root1/hello.kt
diff --git a/compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/j/Java.java b/compiler/testData/integration/ant/jvm/kotlinCompiler/root1/j/Java.java
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/j/Java.java
rename to compiler/testData/integration/ant/jvm/kotlinCompiler/root1/j/Java.java
diff --git a/compiler/integration-tests/testData/ant/jvm/manySourceRoots/build.log.expected b/compiler/testData/integration/ant/jvm/manySourceRoots/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/manySourceRoots/build.log.expected
rename to compiler/testData/integration/ant/jvm/manySourceRoots/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/manySourceRoots/build.xml b/compiler/testData/integration/ant/jvm/manySourceRoots/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/manySourceRoots/build.xml
rename to compiler/testData/integration/ant/jvm/manySourceRoots/build.xml
diff --git a/compiler/integration-tests/testData/ant/jvm/manySourceRoots/hello.run.expected b/compiler/testData/integration/ant/jvm/manySourceRoots/hello.run.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/manySourceRoots/hello.run.expected
rename to compiler/testData/integration/ant/jvm/manySourceRoots/hello.run.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/manySourceRoots/root1/hello.kt b/compiler/testData/integration/ant/jvm/manySourceRoots/root1/hello.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/manySourceRoots/root1/hello.kt
rename to compiler/testData/integration/ant/jvm/manySourceRoots/root1/hello.kt
diff --git a/compiler/integration-tests/testData/ant/jvm/manySourceRoots/root2/foo.kt b/compiler/testData/integration/ant/jvm/manySourceRoots/root2/foo.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/manySourceRoots/root2/foo.kt
rename to compiler/testData/integration/ant/jvm/manySourceRoots/root2/foo.kt
diff --git a/compiler/integration-tests/testData/ant/jvm/suppressWarnings/build.log.expected b/compiler/testData/integration/ant/jvm/suppressWarnings/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/suppressWarnings/build.log.expected
rename to compiler/testData/integration/ant/jvm/suppressWarnings/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/suppressWarnings/build.xml b/compiler/testData/integration/ant/jvm/suppressWarnings/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/suppressWarnings/build.xml
rename to compiler/testData/integration/ant/jvm/suppressWarnings/build.xml
diff --git a/compiler/integration-tests/testData/ant/jvm/suppressWarnings/hello.kt b/compiler/testData/integration/ant/jvm/suppressWarnings/hello.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/suppressWarnings/hello.kt
rename to compiler/testData/integration/ant/jvm/suppressWarnings/hello.kt
diff --git a/compiler/integration-tests/testData/ant/jvm/suppressWarnings/hello.run.expected b/compiler/testData/integration/ant/jvm/suppressWarnings/hello.run.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/suppressWarnings/hello.run.expected
rename to compiler/testData/integration/ant/jvm/suppressWarnings/hello.run.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/verbose/build.log.expected b/compiler/testData/integration/ant/jvm/verbose/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/verbose/build.log.expected
rename to compiler/testData/integration/ant/jvm/verbose/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/verbose/build.xml b/compiler/testData/integration/ant/jvm/verbose/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/verbose/build.xml
rename to compiler/testData/integration/ant/jvm/verbose/build.xml
diff --git a/compiler/integration-tests/testData/ant/jvm/verbose/hello.kt b/compiler/testData/integration/ant/jvm/verbose/hello.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/verbose/hello.kt
rename to compiler/testData/integration/ant/jvm/verbose/hello.kt
diff --git a/compiler/integration-tests/testData/ant/jvm/verbose/hello.run.expected b/compiler/testData/integration/ant/jvm/verbose/hello.run.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/verbose/hello.run.expected
rename to compiler/testData/integration/ant/jvm/verbose/hello.run.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/version/build.log.expected b/compiler/testData/integration/ant/jvm/version/build.log.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/version/build.log.expected
rename to compiler/testData/integration/ant/jvm/version/build.log.expected
diff --git a/compiler/integration-tests/testData/ant/jvm/version/build.xml b/compiler/testData/integration/ant/jvm/version/build.xml
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/version/build.xml
rename to compiler/testData/integration/ant/jvm/version/build.xml
diff --git a/compiler/integration-tests/testData/ant/jvm/version/hello.kt b/compiler/testData/integration/ant/jvm/version/hello.kt
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/version/hello.kt
rename to compiler/testData/integration/ant/jvm/version/hello.kt
diff --git a/compiler/integration-tests/testData/ant/jvm/version/hello.run.expected b/compiler/testData/integration/ant/jvm/version/hello.run.expected
similarity index 100%
rename from compiler/integration-tests/testData/ant/jvm/version/hello.run.expected
rename to compiler/testData/integration/ant/jvm/version/hello.run.expected
diff --git a/compiler/integration-tests/testData/smoke/compilationFailed/hello.compile.expected b/compiler/testData/integration/smoke/compilationFailed/hello.compile.expected
similarity index 100%
rename from compiler/integration-tests/testData/smoke/compilationFailed/hello.compile.expected
rename to compiler/testData/integration/smoke/compilationFailed/hello.compile.expected
diff --git a/compiler/integration-tests/testData/smoke/compilationFailed/hello.kt b/compiler/testData/integration/smoke/compilationFailed/hello.kt
similarity index 100%
rename from compiler/integration-tests/testData/smoke/compilationFailed/hello.kt
rename to compiler/testData/integration/smoke/compilationFailed/hello.kt
diff --git a/compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.compile.expected b/compiler/testData/integration/smoke/compileAndRunModule/Smoke.compile.expected
similarity index 100%
rename from compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.compile.expected
rename to compiler/testData/integration/smoke/compileAndRunModule/Smoke.compile.expected
diff --git a/compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.kt b/compiler/testData/integration/smoke/compileAndRunModule/Smoke.kt
similarity index 100%
rename from compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.kt
rename to compiler/testData/integration/smoke/compileAndRunModule/Smoke.kt
diff --git a/compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.ktm b/compiler/testData/integration/smoke/compileAndRunModule/Smoke.ktm
similarity index 100%
rename from compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.ktm
rename to compiler/testData/integration/smoke/compileAndRunModule/Smoke.ktm
diff --git a/compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.run.expected b/compiler/testData/integration/smoke/compileAndRunModule/Smoke.run.expected
similarity index 100%
rename from compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.run.expected
rename to compiler/testData/integration/smoke/compileAndRunModule/Smoke.run.expected
diff --git a/compiler/integration-tests/testData/smoke/helloApp/hello.compile.expected b/compiler/testData/integration/smoke/helloApp/hello.compile.expected
similarity index 100%
rename from compiler/integration-tests/testData/smoke/helloApp/hello.compile.expected
rename to compiler/testData/integration/smoke/helloApp/hello.compile.expected
diff --git a/compiler/integration-tests/testData/smoke/helloApp/hello.kt b/compiler/testData/integration/smoke/helloApp/hello.kt
similarity index 100%
rename from compiler/integration-tests/testData/smoke/helloApp/hello.kt
rename to compiler/testData/integration/smoke/helloApp/hello.kt
diff --git a/compiler/integration-tests/testData/smoke/helloApp/hello.run.expected b/compiler/testData/integration/smoke/helloApp/hello.run.expected
similarity index 100%
rename from compiler/integration-tests/testData/smoke/helloApp/hello.run.expected
rename to compiler/testData/integration/smoke/helloApp/hello.run.expected
diff --git a/compiler/integration-tests/testData/smoke/helloAppFQMain/hello.compile.expected b/compiler/testData/integration/smoke/helloAppFQMain/hello.compile.expected
similarity index 100%
rename from compiler/integration-tests/testData/smoke/helloAppFQMain/hello.compile.expected
rename to compiler/testData/integration/smoke/helloAppFQMain/hello.compile.expected
diff --git a/compiler/integration-tests/testData/smoke/helloAppFQMain/hello.kt b/compiler/testData/integration/smoke/helloAppFQMain/hello.kt
similarity index 100%
rename from compiler/integration-tests/testData/smoke/helloAppFQMain/hello.kt
rename to compiler/testData/integration/smoke/helloAppFQMain/hello.kt
diff --git a/compiler/integration-tests/testData/smoke/helloAppFQMain/hello.run.expected b/compiler/testData/integration/smoke/helloAppFQMain/hello.run.expected
similarity index 100%
rename from compiler/integration-tests/testData/smoke/helloAppFQMain/hello.run.expected
rename to compiler/testData/integration/smoke/helloAppFQMain/hello.run.expected
diff --git a/compiler/integration-tests/testData/smoke/helloAppVarargMain/hello.compile.expected b/compiler/testData/integration/smoke/helloAppVarargMain/hello.compile.expected
similarity index 100%
rename from compiler/integration-tests/testData/smoke/helloAppVarargMain/hello.compile.expected
rename to compiler/testData/integration/smoke/helloAppVarargMain/hello.compile.expected
diff --git a/compiler/integration-tests/testData/smoke/helloAppVarargMain/hello.kt b/compiler/testData/integration/smoke/helloAppVarargMain/hello.kt
similarity index 100%
rename from compiler/integration-tests/testData/smoke/helloAppVarargMain/hello.kt
rename to compiler/testData/integration/smoke/helloAppVarargMain/hello.kt
diff --git a/compiler/integration-tests/testData/smoke/helloAppVarargMain/hello.run.expected b/compiler/testData/integration/smoke/helloAppVarargMain/hello.run.expected
similarity index 100%
rename from compiler/integration-tests/testData/smoke/helloAppVarargMain/hello.run.expected
rename to compiler/testData/integration/smoke/helloAppVarargMain/hello.run.expected
diff --git a/compiler/integration-tests/testData/smoke/simpleScript/script.expected b/compiler/testData/integration/smoke/simpleScript/script.expected
similarity index 100%
rename from compiler/integration-tests/testData/smoke/simpleScript/script.expected
rename to compiler/testData/integration/smoke/simpleScript/script.expected
diff --git a/compiler/integration-tests/testData/smoke/simpleScript/script.kts b/compiler/testData/integration/smoke/simpleScript/script.kts
similarity index 100%
rename from compiler/integration-tests/testData/smoke/simpleScript/script.kts
rename to compiler/testData/integration/smoke/simpleScript/script.kts
diff --git a/compiler/integration-tests/testData/smoke/syntaxErrors/test.compile.expected b/compiler/testData/integration/smoke/syntaxErrors/test.compile.expected
similarity index 100%
rename from compiler/integration-tests/testData/smoke/syntaxErrors/test.compile.expected
rename to compiler/testData/integration/smoke/syntaxErrors/test.compile.expected
diff --git a/compiler/integration-tests/testData/smoke/syntaxErrors/test.kt b/compiler/testData/integration/smoke/syntaxErrors/test.kt
similarity index 100%
rename from compiler/integration-tests/testData/smoke/syntaxErrors/test.kt
rename to compiler/testData/integration/smoke/syntaxErrors/test.kt
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index f02d57b1c8d..a246fb93f9e 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -19,6 +19,7 @@
     <orderEntry type="module" module-name="serialization.java" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="builtins-serializer" />
-    <orderEntry type="module" module-name="js.frontend" scope="TEST" />
+    <orderEntry type="module" module-name="js.frontend" />
+    <orderEntry type="module" module-name="js.tests" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskBaseTest.java b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskBaseTest.java
similarity index 96%
rename from compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskBaseTest.java
rename to compiler/tests/org/jetbrains/kotlin/integration/AntTaskBaseTest.java
index 4c3324bd040..004fc88706f 100644
--- a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskBaseTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskBaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin;
+package org.jetbrains.kotlin.integration;
 
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJsTest.java b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskJsTest.java
similarity index 94%
rename from compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJsTest.java
rename to compiler/tests/org/jetbrains/kotlin/integration/AntTaskJsTest.java
index a507821b6ff..96ec7890167 100644
--- a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJsTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskJsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin;
+package org.jetbrains.kotlin.integration;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.Function;
@@ -147,7 +147,6 @@ public class AntTaskJsTest extends AntTaskBaseTest {
         doJsAntTest();
     }
 
-
     @Test
     public void outputWithoutDirectory() throws Exception {
         doJsAntTest();
@@ -179,10 +178,10 @@ public class AntTaskJsTest extends AntTaskBaseTest {
     }
 
     @Test
-    public void sourcemap() throws Exception {
+    public void sourceMap() throws Exception {
         doJsAntTest();
 
-        File sourcemap = getOutputFileByName(JS_OUT_FILE + ".map");
-        assertTrue("Sourcemap file \"" + sourcemap.getAbsolutePath() + "\" not found", sourcemap.exists());
+        File sourceMap = getOutputFileByName(JS_OUT_FILE + ".map");
+        assertTrue("Source map file \"" + sourceMap.getAbsolutePath() + "\" not found", sourceMap.exists());
     }
 }
diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJvmTest.java b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskJvmTest.java
similarity index 97%
rename from compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJvmTest.java
rename to compiler/tests/org/jetbrains/kotlin/integration/AntTaskJvmTest.java
index 357f2d9338f..86599310e22 100644
--- a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJvmTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskJvmTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin;
+package org.jetbrains.kotlin.integration;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.utils.UtilsPackage;
diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java
similarity index 97%
rename from compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java
rename to compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java
index 4d69af38f34..0012c90a89b 100644
--- a/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin;
+package org.jetbrains.kotlin.integration;
 
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
similarity index 96%
rename from compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java
rename to compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
index 676e31a6e50..46335bc1dc4 100644
--- a/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java
+++ b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin;
+package org.jetbrains.kotlin.integration;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Files;
@@ -30,6 +30,7 @@ import kotlin.Function1;
 import kotlin.KotlinPackage;
 import org.intellij.lang.annotations.Language;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.cli.common.KotlinVersion;
 import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
@@ -46,8 +47,7 @@ import java.util.regex.Pattern;
 import static org.junit.Assert.*;
 
 public abstract class KotlinIntegrationTestBase {
-    protected static final File INTEGRATION_TEST_DATA_BASE_DIR =
-            new File(getKotlinProjectHome(), "compiler" + File.separator + "integration-tests" + File.separator + "testData");
+    protected static final File INTEGRATION_TEST_DATA_BASE_DIR = new File(JetTestCaseBuilder.getTestDataPathBase(), "integration");
 
     @Rule
     public final Tmpdir tmpdir = new Tmpdir();
@@ -60,8 +60,7 @@ public abstract class KotlinIntegrationTestBase {
     protected abstract File getTestDataDir();
 
     protected int runJava(String logName, String... arguments) throws Exception {
-        GeneralCommandLine commandLine = new GeneralCommandLine();
-        commandLine.setWorkDirectory(getTestDataDir());
+        GeneralCommandLine commandLine = new GeneralCommandLine().withWorkDirectory(getTestDataDir());
         commandLine.setExePath(getJavaRuntime().getAbsolutePath());
         commandLine.addParameters(arguments);