diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
index e8cc0faca62..ef957f2e73c 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
@@ -152,10 +152,13 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
         project.registerTask<DefaultTask>(compilation.compileAllTaskName) {
             it.group = LifecycleBasePlugin.BUILD_GROUP
             it.description = "Assembles outputs for compilation '${compilation.name}' of target '${compilation.target.name}'"
-            it.inputs.files(compilation.output.classesDirs)
+            it.inputs.files(project.provider {
+                // the task may not be registered at this point, reference it lazily
+                compilation.compileKotlinTaskProvider.map { it.outputs.files }
+            })
             it.inputs.files(compilation.output.resourcesDirProvider)
         }
-        (compilation.output.allOutputs as? ConfigurableFileCollection)?.from(project.files().builtBy(compilation.compileAllTaskName))
+        compilation.output.classesDirs.from(project.files().builtBy(compilation.compileAllTaskName))
     }
 
     override fun defineConfigurationsForTarget(target: KotlinTargetType) {