diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt2IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
similarity index 78%
rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt2IT.kt
rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
index 0bb2f76d96f..61aba5ac0db 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt2IT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
@@ -20,13 +20,13 @@ import org.jetbrains.kotlin.gradle.util.*
 import org.junit.Test
 import java.io.File
 
-class Kapt2IT: BaseGradleIT() {
+class Kapt3IT : BaseGradleIT() {
     companion object {
         private const val GRADLE_VERSION = "2.10"
         private const val GRADLE_2_14_VERSION = "2.14.1"
         private const val ANDROID_GRADLE_PLUGIN_VERSION = "1.5.+"
 
-        private val KAPT_SUCCESSFUL_REGEX = "Annotation processing complete in [0-9]+ ms, 0 errors, 0 warnings".toRegex()
+        private val KAPT_SUCCESSFUL_REGEX = "Annotation processing complete, errors: 0".toRegex()
     }
 
     private fun androidBuildOptions() =
@@ -51,7 +51,7 @@ class Kapt2IT: BaseGradleIT() {
             assertKaptSuccessful()
             assertContains(":compileKotlin")
             assertContains(":compileJava")
-            assertFileExists("build/generated/source/kapt2/main/example/TestClassGenerated.java")
+            assertFileExists("build/generated/source/kapt/main/example/TestClassGenerated.java")
             assertFileExists("build/classes/main/example/TestClass.class")
             assertFileExists("build/classes/main/example/TestClassGenerated.class")
             assertFileExists("build/classes/main/example/SourceAnnotatedTestClassGenerated.class")
@@ -106,7 +106,7 @@ class Kapt2IT: BaseGradleIT() {
         Project("arguments", GRADLE_VERSION, directoryPrefix = "kapt2").build("build") {
             assertSuccessful()
             assertKaptSuccessful()
-            assertFileExists("build/generated/source/kapt2/main/example/TestClassCustomized.java")
+            assertFileExists("build/generated/source/kapt/main/example/TestClassCustomized.java")
             assertFileExists("build/classes/main/example/TestClass.class")
             assertFileExists("build/classes/main/example/TestClassCustomized.class")
         }
@@ -117,8 +117,8 @@ class Kapt2IT: BaseGradleIT() {
         Project("inheritedAnnotations", GRADLE_VERSION, directoryPrefix = "kapt2").build("build") {
             assertSuccessful()
             assertKaptSuccessful()
-            assertFileExists("build/generated/source/kapt2/main/example/TestClassGenerated.java")
-            assertFileExists("build/generated/source/kapt2/main/example/AncestorClassGenerated.java")
+            assertFileExists("build/generated/source/kapt/main/example/TestClassGenerated.java")
+            assertFileExists("build/generated/source/kapt/main/example/AncestorClassGenerated.java")
             assertFileExists("build/classes/main/example/TestClassGenerated.class")
             assertFileExists("build/classes/main/example/AncestorClassGenerated.class")
         }
@@ -132,7 +132,7 @@ class Kapt2IT: BaseGradleIT() {
         project.build("compileReleaseSources", options = options) {
             assertSuccessful()
             assertKaptSuccessful()
-            assertFileExists("app/build/generated/source/kapt2/release/org/example/kotlin/butterknife/SimpleActivity\$\$ViewBinder.java")
+            assertFileExists("app/build/generated/source/kapt/release/org/example/kotlin/butterknife/SimpleActivity\$\$ViewBinder.java")
             assertFileExists("app/build/intermediates/classes/release/org/example/kotlin/butterknife/SimpleActivity\$\$ViewBinder.class")
             assertFileExists("app/build/intermediates/classes/release/org/example/kotlin/butterknife/SimpleAdapter\$ViewHolder.class")
         }
@@ -152,8 +152,8 @@ class Kapt2IT: BaseGradleIT() {
         project.build("compileReleaseSources", options = options) {
             assertSuccessful()
             assertKaptSuccessful()
-            assertFileExists("app/build/generated/source/kapt2/release/com/example/dagger/kotlin/DaggerApplicationComponent.java")
-            assertFileExists("app/build/generated/source/kapt2/release/com/example/dagger/kotlin/ui/HomeActivity_MembersInjector.java")
+            assertFileExists("app/build/generated/source/kapt/release/com/example/dagger/kotlin/DaggerApplicationComponent.java")
+            assertFileExists("app/build/generated/source/kapt/release/com/example/dagger/kotlin/ui/HomeActivity_MembersInjector.java")
             assertFileExists("app/build/intermediates/classes/release/com/example/dagger/kotlin/DaggerApplicationComponent.class")
             assertFileExists("app/build/intermediates/classes/release/com/example/dagger/kotlin/AndroidModule.class")
         }
@@ -167,10 +167,10 @@ class Kapt2IT: BaseGradleIT() {
         project.build("compileReleaseSources", options = options) {
             assertSuccessful()
             assertKaptSuccessful()
-            assertFileExists("app/build/generated/source/kapt2/release/com/raizlabs/android/dbflow/config/GeneratedDatabaseHolder.java")
-            assertFileExists("app/build/generated/source/kapt2/release/com/raizlabs/android/dbflow/config/AppDatabaseapp_Database.java")
-            assertFileExists("app/build/generated/source/kapt2/release/mobi/porquenao/poc/kotlin/core/Item_Table.java")
-            assertFileExists("app/build/generated/source/kapt2/release/mobi/porquenao/poc/kotlin/core/Item_Adapter.java")
+            assertFileExists("app/build/generated/source/kapt/release/com/raizlabs/android/dbflow/config/GeneratedDatabaseHolder.java")
+            assertFileExists("app/build/generated/source/kapt/release/com/raizlabs/android/dbflow/config/AppDatabaseapp_Database.java")
+            assertFileExists("app/build/generated/source/kapt/release/mobi/porquenao/poc/kotlin/core/Item_Table.java")
+            assertFileExists("app/build/generated/source/kapt/release/mobi/porquenao/poc/kotlin/core/Item_Adapter.java")
         }
     }
 
@@ -182,10 +182,10 @@ class Kapt2IT: BaseGradleIT() {
         project.build("compileReleaseSources", options = options) {
             assertSuccessful()
             assertKaptSuccessful()
-            assertFileExists("build/generated/source/kapt2/release/io/realm/CatRealmProxy.java")
-            assertFileExists("build/generated/source/kapt2/release/io/realm/CatRealmProxyInterface.java")
-            assertFileExists("build/generated/source/kapt2/release/io/realm/DefaultRealmModule.java")
-            assertFileExists("build/generated/source/kapt2/release/io/realm/DefaultRealmModuleMediator.java")
+            assertFileExists("build/generated/source/kapt/release/io/realm/CatRealmProxy.java")
+            assertFileExists("build/generated/source/kapt/release/io/realm/CatRealmProxyInterface.java")
+            assertFileExists("build/generated/source/kapt/release/io/realm/DefaultRealmModule.java")
+            assertFileExists("build/generated/source/kapt/release/io/realm/DefaultRealmModuleMediator.java")
         }
     }
 
@@ -200,10 +200,10 @@ class Kapt2IT: BaseGradleIT() {
             assertContains(":compileJava")
             assertFileExists("build/classes/main/example/TestClass.class")
 
-            assertFileExists("build/generated/source/kapt2/main/example/TestClassGenerated.java")
-            assertFileExists("build/generated/source/kapt2/main/example/SourceAnnotatedTestClassGenerated.java")
-            assertFileExists("build/generated/source/kapt2/main/example/BinaryAnnotatedTestClassGenerated.java")
-            assertFileExists("build/generated/source/kapt2/main/example/RuntimeAnnotatedTestClassGenerated.java")
+            assertFileExists("build/generated/source/kapt/main/example/TestClassGenerated.java")
+            assertFileExists("build/generated/source/kapt/main/example/SourceAnnotatedTestClassGenerated.java")
+            assertFileExists("build/generated/source/kapt/main/example/BinaryAnnotatedTestClassGenerated.java")
+            assertFileExists("build/generated/source/kapt/main/example/RuntimeAnnotatedTestClassGenerated.java")
 
             assertFileExists("build/classes/main/example/TestClassGenerated.class")
             assertFileExists("build/classes/main/example/SourceAnnotatedTestClassGenerated.class")
@@ -220,10 +220,10 @@ class Kapt2IT: BaseGradleIT() {
             assertContains(":compileJava")
             assertFileExists("build/classes/main/example/TestClass.class")
 
-            assertFileExists("build/generated/source/kapt2/main/example/TestClassGenerated.java")
-            assertFileExists("build/generated/source/kapt2/main/example/SourceAnnotatedTestClassGenerated.java")
-            /*!*/   assertNoSuchFile("build/generated/source/kapt2/main/example/BinaryAnnotatedTestClassGenerated.java")
-            assertFileExists("build/generated/source/kapt2/main/example/RuntimeAnnotatedTestClassGenerated.java")
+            assertFileExists("build/generated/source/kapt/main/example/TestClassGenerated.java")
+            assertFileExists("build/generated/source/kapt/main/example/SourceAnnotatedTestClassGenerated.java")
+            /*!*/   assertNoSuchFile("build/generated/source/kapt/main/example/BinaryAnnotatedTestClassGenerated.java")
+            assertFileExists("build/generated/source/kapt/main/example/RuntimeAnnotatedTestClassGenerated.java")
 
             assertFileExists("build/classes/main/example/TestClassGenerated.class")
             assertFileExists("build/classes/main/example/SourceAnnotatedTestClassGenerated.class")
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt
index b3ea808aad9..a2dc787a45a 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt
@@ -55,6 +55,7 @@ open class KaptTask : AbstractCompile() {
         args.moduleName = kotlinCompileTask.moduleName
         args.pluginClasspaths = pluginOptions.classpath.toTypedArray()
         args.pluginOptions = pluginOptions.arguments.toTypedArray()
+        kotlinCompileTask.friendTaskName?.let { kotlinCompileTask.addFriendPathForTestTask(it, args) }
         kotlinCompileTask.parentKotlinOptionsImpl?.updateArguments(args)
         KotlinJvmOptionsImpl().updateArguments(args)
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index 292d3459149..cc96888833b 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -159,13 +159,7 @@ open class KotlinCompile : AbstractKotlinCompile<K2JVMCompilerArguments>(), Kotl
             args.loadBuiltInsFromDependencies = true
         }
 
-        friendTaskName?.let addFriendPathForTestTask@ { friendKotlinTaskName ->
-            val friendTask = project.getTasksByName(friendKotlinTaskName, /* recursive = */false).firstOrNull() as? KotlinCompile ?: return@addFriendPathForTestTask
-            args.friendPaths = arrayOf(friendTask.javaOutputDir!!.absolutePath)
-            args.moduleName = friendTask.moduleName
-            logger.kotlinDebug("java destination directory for production = ${friendTask.javaOutputDir}")
-        }
-
+        friendTaskName?.let { addFriendPathForTestTask(it, args) }
         parentKotlinOptionsImpl?.updateArguments(args)
         kotlinOptionsImpl.updateArguments(args)