diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/Android25ProjectHandler.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/Android25ProjectHandler.kt
index a121f25c198..901d4172beb 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/Android25ProjectHandler.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/Android25ProjectHandler.kt
@@ -6,6 +6,7 @@
 @file:Suppress("PackageDirectoryMismatch") // Old package for compatibility
 package org.jetbrains.kotlin.gradle.plugin
 
+import com.android.build.api.attributes.BuildTypeAttr
 import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.BasePlugin
 import com.android.build.gradle.api.*
@@ -148,6 +149,11 @@ class Android25ProjectHandler(
             project.addExtendsFromRelation(name, compilation.runtimeDependencyConfigurationName)
         }
 
+        val buildTypeAttrValue = project.objects.named(BuildTypeAttr::class.java, variant.name)
+        listOf(compilation.compileDependencyConfigurationName, compilation.runtimeDependencyConfigurationName).forEach {
+            project.configurations.findByName(it)?.attributes?.attribute(BuildTypeAttr.ATTRIBUTE, buildTypeAttrValue)
+        }
+
         // TODO this code depends on the convention that is present in the Android plugin as there's no public API
         // We should request such API in the Android plugin
         val apiElementsConfigurationName = "${variant.name}ApiElements"