diff --git a/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
index ef80b5909df..0d72904a2ce 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.autoservice.gradle.kts
@@ -16,6 +16,7 @@
  */
 
 import com.github.vlsi.gradle.dsl.configureEach
+import org.jetbrains.kotlin.gradle.tasks.Kapt
 
 plugins {
     id("java-library")
@@ -36,6 +37,11 @@ plugins.withId("org.jetbrains.kotlin.jvm") {
             "kapt"(platform(it))
         }
     }
+
+    tasks.configureEach<Kapt> {
+        // Workaround for https://youtrack.jetbrains.com/issue/KT-45329/IDE-KAPT-Number-of-loaded-files-in-snapshots-differs-when-using-Run-with-Coverage-and-project-has-Java-and-Kotlin-targets-with
+        inputs.property("wa.to.trigger.full.recompilation", "1")
+    }
 }
 
 tasks.configureEach<Jar> {
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index c0ebe1fc3de..38fa682e8e6 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -188,10 +188,3 @@ tasks.jar {
         from("$rootDir/xdocs/images/logo.svg")
     }
 }
-
-afterEvaluate {
-    tasks.named("kaptTestFixturesKotlin") {
-        // Workaround for https://youtrack.jetbrains.com/issue/KT-45329/IDE-KAPT-Number-of-loaded-files-in-snapshots-differs-when-using-Run-with-Coverage-and-project-has-Java-and-Kotlin-targets-with
-        inputs.property("wa.to.trigger.full.recompilation", "1")
-    }
-}