diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
index 1154ff6b427..92c8a96ceba 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
@@ -325,7 +325,8 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand
         project.afterEvaluate { project ->
             if (project != null) {
                 val plugin = (project.plugins.findPlugin("android")
-                                ?: project.plugins.findPlugin("android-library")) as BasePlugin
+                                ?: project.plugins.findPlugin("android-library")
+                                ?: project.plugins.findPlugin("com.android.test")) as BasePlugin
 
                 val variantManager = AndroidGradleWrapper.getVariantDataManager(plugin)
                 processVariantData(variantManager.variantDataList, project,
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
index 4ef01e0915a..877840d7f2d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
@@ -25,6 +25,7 @@ abstract class AbstractKotlinAndroidGradleTests(
         project.build("build") {
             assertSuccessful()
             assertContains(":Lib:compileReleaseKotlin",
+                    ":Test:compileReleaseKotlin",
                     ":compileFlavor1DebugKotlin",
                     ":compileFlavor2DebugKotlin",
                     ":compileFlavor1JnidebugKotlin",
@@ -50,6 +51,7 @@ abstract class AbstractKotlinAndroidGradleTests(
         project.build("build", "--rerun-tasks") {
             assertSuccessful()
             assertContains(":Lib:compileReleaseKotlin",
+                    ":Test:compileReleaseKotlin",
                     ":compileFlavor1DebugKotlin",
                     ":compileFlavor2DebugKotlin",
                     ":compileFlavor1JnidebugKotlin",
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle
index dbded171820..6286c004c33 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle
@@ -38,4 +38,6 @@ android {
             minSdkVersion 14
         }
     }
+
+    publishNonDefault true
 }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Test/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Test/build.gradle
new file mode 100644
index 00000000000..a7483c98f3e
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Test/build.gradle
@@ -0,0 +1,21 @@
+apply plugin: 'com.android.test'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion "21.1.2"
+
+    sourceSets {
+        main.kotlin.srcDirs += 'root/kotlin'
+    }
+
+    defaultConfig {
+        minSdkVersion 7
+        targetSdkVersion 22
+
+        testApplicationId 'org.jetbrains.kotlin.gradle.test.androidalfa'
+    }
+
+    targetProjectPath ':Android'
+    targetVariant 'debug'
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Test/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Test/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..b409c91e568
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Test/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="org.jetbrains.kotlin.gradle.test.android.test"/>
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/settings.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/settings.gradle
index d399c228f26..db94fbc4f4f 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/settings.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/settings.gradle
@@ -1 +1 @@
-include ':Android', ':Lib'
+include ':Android', ':Lib', ':Test'