diff --git a/libraries/tools/kotlin-annotation-processing/build.gradle.kts b/libraries/tools/kotlin-annotation-processing/build.gradle.kts
index 121ac9025c9..27d9350edc9 100644
--- a/libraries/tools/kotlin-annotation-processing/build.gradle.kts
+++ b/libraries/tools/kotlin-annotation-processing/build.gradle.kts
@@ -31,11 +31,6 @@ projectTest {
     workingDir = projectDir
 }
 
-val jar by tasks
-jar.apply {
-    enabled = false
-}
-
 runtimeJar(task<ShadowJar>("shadowJar")) {
     from(packedJars)
     from(the<JavaPluginConvention>().sourceSets.getByName("main").output)
diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle b/libraries/tools/kotlin-gradle-plugin/build.gradle
index 72bf195c6fd..a32636a6141 100644
--- a/libraries/tools/kotlin-gradle-plugin/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/build.gradle
@@ -28,26 +28,35 @@ configurations {
 
 dependencies {
     compile project(':kotlin-gradle-plugin-api')
-    compile project(path: ':kotlin-compiler-embeddable', configuration: "runtimeJar")
+    compileOnly project(':compiler')
+    compileOnly project(':compiler:incremental-compilation-impl')
 
     compile project(':kotlin-stdlib')
     compile project(':kotlin-android-extensions')
     compile project(':kotlin-build-common')
     compile project(':kotlin-compiler-runner')
-//    compileOnly project(":compiler:daemon")
-    compile project(path: ':kotlin-annotation-processing-gradle', configuration: "runtimeJar")
+    compileOnly project(':kotlin-annotation-processing')
+    compileOnly project(':kotlin-annotation-processing-gradle')
 
     compileOnly 'com.android.tools.build:gradle:2.0.0'
     compileOnly 'org.codehaus.groovy:groovy-all:2.3.9'
     compileOnly 'org.jetbrains.kotlin:gradle-api:2.2'
 
+    runtime project(path: ':kotlin-compiler-embeddable', configuration: "runtimeJar")
+    runtime project(path: ':kotlin-annotation-processing-gradle', configuration: "runtimeJar")
+
     agp25CompileOnly 'com.android.tools.build:gradle:3.0.0-alpha1'
     agp25CompileOnly 'org.codehaus.groovy:groovy-all:2.3.9'
     agp25CompileOnly gradleApi()
+    agp25CompileOnly project(':kotlin-annotation-processing')
+    agp25CompileOnly project(':kotlin-annotation-processing-gradle')
 
+    testCompileOnly project(':compiler')
     testCompile project (path: ':kotlin-build-common', configuration: 'tests-jar')
     testCompile project(':kotlin-test::kotlin-test-junit')
     testCompile "junit:junit:4.12"
+    testCompileOnly project(':kotlin-annotation-processing')
+    testCompileOnly project(':kotlin-annotation-processing-gradle')
 }
 
 tasks.withType(project.compileKotlin.class) {