diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts
index 4a948ac802f..ca9641470b3 100644
--- a/compiler/android-tests/build.gradle.kts
+++ b/compiler/android-tests/build.gradle.kts
@@ -6,25 +6,23 @@ plugins {
 }
 
 dependencies {
-    compile(project(":compiler:util"))
-    compile(project(":compiler:cli"))
-    compile(project(":compiler:frontend"))
-    compile(project(":compiler:backend"))
-    compile(kotlinStdlib())
-    compile(project(":kotlin-reflect"))
-    compile(projectTests(":compiler:tests-common"))
-    compile(commonDep("junit:junit"))
-
-    Platform[193].orLower {
-        compileOnly(intellijDep()) { includeJars("openapi") }
-    }
-
-    testCompile(project(":compiler:incremental-compilation-impl"))
     testCompile(project(":core:descriptors"))
     testCompile(project(":core:descriptors.jvm"))
+    testCompile(project(":compiler:util"))
+    testCompile(project(":compiler:cli"))
+    testCompile(project(":compiler:frontend"))
+    testCompile(project(":compiler:backend"))
+    testCompile(project(":compiler:incremental-compilation-impl"))
     testCompile(project(":compiler:frontend.java"))
+
+    testCompile(kotlinStdlib())
+    testCompile(project(":kotlin-reflect"))
+    testCompile(projectTests(":compiler:tests-common"))
+    testCompile(commonDep("junit:junit"))
+
     testCompile(projectTests(":jps-plugin"))
     testCompile(commonDep("junit:junit"))
+
     Platform[193].orLower {
         testCompile(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
     }
@@ -44,7 +42,7 @@ dependencies {
 }
 
 sourceSets {
-    "main" { projectDefault() }
+    "main" { }
     "test" { projectDefault() }
 }
 
diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.kt b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.kt
similarity index 100%
rename from compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.kt
rename to compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.kt
diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/OutputUtils.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/OutputUtils.java
similarity index 100%
rename from compiler/android-tests/src/org/jetbrains/kotlin/android/tests/OutputUtils.java
rename to compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/OutputUtils.java
diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/PathManager.java
similarity index 100%
rename from compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java
rename to compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/PathManager.java
diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/emulator/Emulator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/emulator/Emulator.java
similarity index 100%
rename from compiler/android-tests/src/org/jetbrains/kotlin/android/tests/emulator/Emulator.java
rename to compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/emulator/Emulator.java
diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/gradle/GradleRunner.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/gradle/GradleRunner.java
similarity index 100%
rename from compiler/android-tests/src/org/jetbrains/kotlin/android/tests/gradle/GradleRunner.java
rename to compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/gradle/GradleRunner.java
diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/RunResult.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/run/RunResult.java
similarity index 100%
rename from compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/RunResult.java
rename to compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/run/RunResult.java
diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/RunUtils.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/run/RunUtils.java
similarity index 100%
rename from compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/RunUtils.java
rename to compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/run/RunUtils.java