diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt
index cda43e5fe16..0c2eb668705 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt
@@ -204,7 +204,9 @@ class AndroidSubplugin : KotlinGradleSubplugin<KotlinCompile> {
                 addSourceSetAsVariant(flavorName)
             }
 
-            addSourceSetAsVariant(variantName)
+            if (buildTypeName != variantName && buildTypeName != flavorName) {
+                addSourceSetAsVariant(variantName)
+            }
         }
 
         return wrapPluginOptions(pluginOptions, "configuration")