diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
index c000000d96f..e12dcbfe067 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
@@ -151,10 +151,11 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
             it.description = "Assembles outputs for compilation '${compilation.name}' of target '${compilation.target.name}'"
             it.inputs.files(project.provider {
                 // the task may not be registered at this point, reference it lazily
-                compilation.output.classesDirs
+                compilation.compileKotlinTaskProvider.map { it.outputs.files }
             })
             it.inputs.files(compilation.output.resourcesDirProvider)
         }
+        compilation.output.classesDirs.from(project.files().builtBy(compilation.compileAllTaskName))
     }
 
     override fun defineConfigurationsForTarget(target: KotlinTargetType) {