diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index f0cc4f285e9..090d9c2b51a 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -43,20 +43,21 @@ dependencies {
     testCompileOnly(projectDist(":kotlin-test:kotlin-test-jvm"))
     testCompileOnly(projectDist(":kotlin-test:kotlin-test-junit"))
     testCompile(projectTests(":compiler:tests-common"))
-    testCompile(project(":compiler:tests-common-jvm6"))
+    testCompile(projectTests(":compiler:tests-common-jvm6"))
     testCompile(project(":compiler:ir.ir2cfg"))
     testCompile(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward
     testCompileOnly(project(":kotlin-daemon-client"))
     otherCompilerModules.forEach {
         testCompileOnly(project(it))
     }
+    testCompile(ideaSdkDeps("openapi", "idea", "util", "asm-all", "commons-httpclient-3.1-patched"))
 
     testRuntime(projectDist(":kotlin-compiler"))
     testRuntime(projectDist(":kotlin-daemon-client"))
     testRuntime(preloadedDeps("dx", subdir = "android-5.0/lib"))
-    testCompile(ideaSdkDeps("openapi", "idea", "util", "asm-all", "commons-httpclient-3.1-patched"))
     testRuntime(ideaSdkCoreDeps("*.jar"))
     testRuntime(ideaSdkDeps("*.jar"))
+    testRuntime(files("${System.getProperty("java.home")}/../lib/tools.jar"))
 }
 
 sourceSets {
diff --git a/compiler/tests-common-jvm6/build.gradle.kts b/compiler/tests-common-jvm6/build.gradle.kts
index fdf18781097..c3cfda785c2 100644
--- a/compiler/tests-common-jvm6/build.gradle.kts
+++ b/compiler/tests-common-jvm6/build.gradle.kts
@@ -4,19 +4,21 @@ apply { plugin("kotlin") }
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":core"))
-    compile(project(":core::util.runtime"))
-    compile(project(":compiler:util"))
-    compile(project(":compiler:backend"))
-    compile(project(":compiler:frontend"))
-    compile(project(":compiler:frontend.java"))
-    compile(project(":compiler:util"))
-    compile(project(":compiler:cli-common"))
-    compile(project(":compiler:cli"))
-    compile(project(":kotlin-test:kotlin-test-jvm"))
+    testCompile(project(":core"))
+    testCompile(project(":core::util.runtime"))
+    testCompile(project(":compiler:util"))
+    testCompile(project(":compiler:backend"))
+    testCompile(project(":compiler:frontend"))
+    testCompile(project(":compiler:frontend.java"))
+    testCompile(project(":compiler:util"))
+    testCompile(project(":compiler:cli-common"))
+    testCompile(project(":compiler:cli"))
+    testCompile(project(":kotlin-test:kotlin-test-jvm"))
 }
 
 sourceSets {
-    "main" { projectDefault() }
-    "test" {}
+    "main" { }
+    "test" { projectDefault() }
 }
+
+testsJar {}
diff --git a/compiler/tests-common-jvm6/src/org/jetbrains/kotlin/test/clientserver/MessageHeader.kt b/compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/MessageHeader.kt
similarity index 100%
rename from compiler/tests-common-jvm6/src/org/jetbrains/kotlin/test/clientserver/MessageHeader.kt
rename to compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/MessageHeader.kt
diff --git a/compiler/tests-common-jvm6/src/org/jetbrains/kotlin/test/clientserver/TestProcessServer.kt b/compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/TestProcessServer.kt
similarity index 100%
rename from compiler/tests-common-jvm6/src/org/jetbrains/kotlin/test/clientserver/TestProcessServer.kt
rename to compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/TestProcessServer.kt
diff --git a/compiler/tests-common-jvm6/src/org/jetbrains/kotlin/test/clientserver/TestProxy.kt b/compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/TestProxy.kt
similarity index 100%
rename from compiler/tests-common-jvm6/src/org/jetbrains/kotlin/test/clientserver/TestProxy.kt
rename to compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/TestProxy.kt
diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts
index ca3425a3f2b..e12a465c4bf 100644
--- a/compiler/tests-common/build.gradle.kts
+++ b/compiler/tests-common/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     testCompile(project(":js:js.translator"))
     testCompileOnly(project(":plugins:android-extensions-compiler"))
     testCompile(project(":kotlin-test:kotlin-test-jvm"))
-    testCompile(project(":compiler:tests-common-jvm6"))
+    testCompile(projectTests(":compiler:tests-common-jvm6"))
     testCompile(commonDep("junit:junit"))
     testCompile(ideaSdkCoreDeps("intellij-core"))
     testCompile(ideaSdkDeps("openapi", "idea", "idea_rt"))
diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts
index f9751c0d0c3..3ffa98e4edf 100644
--- a/compiler/tests-java8/build.gradle.kts
+++ b/compiler/tests-java8/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     testCompile(projectDist(":kotlin-reflect"))
     testCompile(projectTests(":compiler"))
     testCompile(projectTests(":compiler:tests-common"))
+    testCompile(projectTests(":compiler:tests-common-jvm6"))
     testRuntime(projectRuntimeJar(":kotlin-preloader"))
     testRuntime(preloadedDeps("dx", subdir = "android-5.0/lib"))
     testRuntime(ideaSdkCoreDeps("*.jar"))