diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts
index ceb0111cab2..751077e4bee 100644
--- a/generators/build.gradle.kts
+++ b/generators/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
 }
 
 sourceSets {
-    "main" { projectDefault() }
+    "main" { }
     "test" { projectDefault() }
 }
 
diff --git a/generators/src/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
rename to generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/arrayIterators.kt b/generators/tests/org/jetbrains/kotlin/generators/builtins/arrayIterators.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/builtins/arrayIterators.kt
rename to generators/tests/org/jetbrains/kotlin/generators/builtins/arrayIterators.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/arrays.kt b/generators/tests/org/jetbrains/kotlin/generators/builtins/arrays.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/builtins/arrays.kt
rename to generators/tests/org/jetbrains/kotlin/generators/builtins/arrays.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/common.kt b/generators/tests/org/jetbrains/kotlin/generators/builtins/common.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/builtins/common.kt
rename to generators/tests/org/jetbrains/kotlin/generators/builtins/common.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/functions.kt b/generators/tests/org/jetbrains/kotlin/generators/builtins/functions.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/builtins/functions.kt
rename to generators/tests/org/jetbrains/kotlin/generators/builtins/functions.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt b/generators/tests/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt
rename to generators/tests/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/iterators.kt b/generators/tests/org/jetbrains/kotlin/generators/builtins/iterators.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/builtins/iterators.kt
rename to generators/tests/org/jetbrains/kotlin/generators/builtins/iterators.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/primitives.kt b/generators/tests/org/jetbrains/kotlin/generators/builtins/primitives.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/builtins/primitives.kt
rename to generators/tests/org/jetbrains/kotlin/generators/builtins/primitives.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/progressionIterators.kt b/generators/tests/org/jetbrains/kotlin/generators/builtins/progressionIterators.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/builtins/progressionIterators.kt
rename to generators/tests/org/jetbrains/kotlin/generators/builtins/progressionIterators.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt b/generators/tests/org/jetbrains/kotlin/generators/builtins/progressions.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt
rename to generators/tests/org/jetbrains/kotlin/generators/builtins/progressions.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/ranges.kt b/generators/tests/org/jetbrains/kotlin/generators/builtins/ranges.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/builtins/ranges.kt
rename to generators/tests/org/jetbrains/kotlin/generators/builtins/ranges.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt b/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt
rename to generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java b/generators/tests/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java
rename to generators/tests/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java
diff --git a/generators/src/org/jetbrains/kotlin/generators/mockJDK/GenerateMockJdk.java b/generators/tests/org/jetbrains/kotlin/generators/mockJDK/GenerateMockJdk.java
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/mockJDK/GenerateMockJdk.java
rename to generators/tests/org/jetbrains/kotlin/generators/mockJDK/GenerateMockJdk.java
diff --git a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt b/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
rename to generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt b/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
rename to generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateInRangeExpressionTestData.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateInRangeExpressionTestData.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/tests/GenerateInRangeExpressionTestData.kt
rename to generators/tests/org/jetbrains/kotlin/generators/tests/GenerateInRangeExpressionTestData.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GeneratePrimitiveVsObjectEqualityTestData.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GeneratePrimitiveVsObjectEqualityTestData.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/tests/GeneratePrimitiveVsObjectEqualityTestData.kt
rename to generators/tests/org/jetbrains/kotlin/generators/tests/GeneratePrimitiveVsObjectEqualityTestData.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
similarity index 100%
rename from generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
rename to generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 5c9b07a2f16..526a0d05b4b 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -52,7 +52,7 @@ dependencies {
 
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(projectTests(":compiler:tests-common"))
-    testCompile(project(":idea:idea-test-framework")) { isTransitive = false }
+    testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false }
     testCompile(project(":idea:idea-jvm")) { isTransitive = false }
     testCompile(project(":idea:idea-gradle")) { isTransitive = false }
     testCompile(project(":idea:idea-maven")) { isTransitive = false }
diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts
index a9672b0edf1..c03fd89382c 100644
--- a/idea/idea-android/build.gradle.kts
+++ b/idea/idea-android/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     }
 
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
-    testCompile(project(":idea:idea-test-framework")) { isTransitive = false }
+    testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false }
     testCompile(project(":plugins:lint")) { isTransitive = false }
     testCompile(project(":idea:idea-jvm"))
     testCompile(projectTests(":compiler:tests-common"))
diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts
index 71737e23ead..fc5b340fd1c 100644
--- a/idea/idea-gradle/build.gradle.kts
+++ b/idea/idea-gradle/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
     compileOnly(intellijPluginDep("junit")) { includeJars("idea-junit") }
 
     testCompile(projectTests(":idea"))
-    testCompile(project(":idea:idea-test-framework"))
+    testCompile(projectTests(":idea:idea-test-framework"))
 
     testCompile(intellijPluginDep("gradle")) { includeJars("gradle-wrapper", "gradle-base-services", "gradle-tooling-extension-impl", "gradle-tooling-api", "gradle", rootProject = rootProject) }
     testCompileOnly(intellijPluginDep("Groovy")) { includeJars("Groovy") }
diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts
index 18e682d882e..42ac16a7499 100644
--- a/idea/idea-maven/build.gradle.kts
+++ b/idea/idea-maven/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
 
     testCompile(projectTests(":idea"))
     testCompile(projectTests(":compiler:tests-common"))
-    testCompile(project(":idea:idea-test-framework"))
+    testCompile(projectTests(":idea:idea-test-framework"))
 
     testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "gson", "idea_rt", rootProject = rootProject) }
     testCompileOnly(intellijPluginDep("maven")) { includeJars("maven", "maven-server-api") }
diff --git a/idea/idea-test-framework/build.gradle.kts b/idea/idea-test-framework/build.gradle.kts
index 61a76dedd55..c4010a0138e 100644
--- a/idea/idea-test-framework/build.gradle.kts
+++ b/idea/idea-test-framework/build.gradle.kts
@@ -3,22 +3,22 @@ apply { plugin("kotlin") }
 apply { plugin("jps-compatible") }
 
 dependencies {
-    compile(project(":compiler:frontend"))
-    compile(project(":compiler:frontend.script"))
-    compile(projectTests(":compiler:tests-common"))
-    compile(project(":idea"))
-    compile(project(":idea:idea-jvm"))
-    compile(project(":idea:idea-core"))
-    compile(project(":idea:idea-jps-common"))
-    compile(project(":kotlin-test:kotlin-test-jvm"))
-    compileOnly(project(":kotlin-reflect-api"))
-    compile(commonDep("junit:junit"))
-    compileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") }
+    testCompile(project(":compiler:frontend"))
+    testCompile(project(":compiler:frontend.script"))
+    testCompile(projectTests(":compiler:tests-common"))
+    testCompile(project(":idea"))
+    testCompile(project(":idea:idea-jvm"))
+    testCompile(project(":idea:idea-core"))
+    testCompile(project(":idea:idea-jps-common"))
+    testCompile(project(":kotlin-test:kotlin-test-jvm"))
+    testCompileOnly(project(":kotlin-reflect-api"))
+    testCompile(commonDep("junit:junit"))
+    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") }
 }
 
 sourceSets {
-    "main" { projectDefault() }
-    "test" {}
+    "main" { }
+    "test" { projectDefault() }
 }
 
-
+testsJar()
\ No newline at end of file
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/AstAccessControl.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/AstAccessControl.kt
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/AstAccessControl.kt
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/AstAccessControl.kt
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.kt
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.kt
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.kt
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/DirectiveBasedActionUtils.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/DirectiveBasedActionUtils.kt
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/DirectiveBasedActionUtils.kt
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/DirectiveBasedActionUtils.kt
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinJdkAndLibraryProjectDescriptor.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinJdkAndLibraryProjectDescriptor.kt
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinJdkAndLibraryProjectDescriptor.kt
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinJdkAndLibraryProjectDescriptor.kt
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightJava9ModulesCodeInsightFixtureTestCase.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightJava9ModulesCodeInsightFixtureTestCase.kt
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightJava9ModulesCodeInsightFixtureTestCase.kt
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightJava9ModulesCodeInsightFixtureTestCase.kt
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightFixtureTestCase.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightFixtureTestCase.kt
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightFixtureTestCase.kt
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightFixtureTestCase.kt
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiModuleJava9ProjectDescriptor.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinMultiModuleJava9ProjectDescriptor.kt
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiModuleJava9ProjectDescriptor.kt
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinMultiModuleJava9ProjectDescriptor.kt
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinProjectDescriptorWithFacet.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinProjectDescriptorWithFacet.kt
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinProjectDescriptorWithFacet.kt
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinProjectDescriptorWithFacet.kt
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinTestImportFilter.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinTestImportFilter.kt
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinTestImportFilter.kt
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinTestImportFilter.kt
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/RunnableWithException.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/RunnableWithException.java
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/RunnableWithException.java
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/RunnableWithException.java
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/SdkAndMockLibraryProjectDescriptor.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/SdkAndMockLibraryProjectDescriptor.java
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/SdkAndMockLibraryProjectDescriptor.java
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/SdkAndMockLibraryProjectDescriptor.java
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/TestFixtureExtension.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/TestFixtureExtension.kt
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/TestFixtureExtension.kt
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/TestFixtureExtension.kt
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt
similarity index 100%
rename from idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt
rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt
diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts
index 11ae2c86057..ce92e315a7a 100644
--- a/j2k/build.gradle.kts
+++ b/j2k/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
     testCompile(project(":idea"))
-    testCompile(project(":idea:idea-test-framework"))
+    testCompile(projectTests(":idea:idea-test-framework"))
     testCompile(project(":compiler:light-classes"))
     testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
index 18042186a1b..d7f11433b11 100644
--- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
     testCompile(project(":compiler:tests-common"))
     testCompile(project(":compiler:cli"))
     testCompile(project(":compiler:frontend.java"))
-    testCompile(project(":idea:idea-test-framework")) { isTransitive = false }
+    testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false }
     testCompile(project(":plugins:kapt3-idea"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(projectTests(":idea"))
diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts
index f6b4959d074..e47e6fbd209 100644
--- a/plugins/uast-kotlin/build.gradle.kts
+++ b/plugins/uast-kotlin/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
     testCompile(commonDep("junit:junit"))
     testCompile(project(":compiler:util"))
     testCompile(project(":compiler:cli"))
-    testCompile(project(":idea:idea-test-framework"))
+    testCompile(projectTests(":idea:idea-test-framework"))
     testCompileOnly(intellijDep()) { includeJars("idea_rt") }
 
     testRuntime(projectDist(":kotlin-reflect"))
diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts
index 8889d015b7b..cd917cf1a10 100644
--- a/ultimate/build.gradle.kts
+++ b/ultimate/build.gradle.kts
@@ -57,7 +57,7 @@ dependencies {
     }
 
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
-    testCompile(project(":idea:idea-test-framework")) { isTransitive = false }
+    testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false }
     testCompile(project(":plugins:lint")) { isTransitive = false }
     testCompile(project(":idea:idea-jvm")) { isTransitive = false }
     testCompile(projectTests(":compiler:tests-common"))