diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt
index ee1387980b6..7a05d9e9c08 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt
@@ -57,11 +57,13 @@ class IncrementalConstantSearchTest : AbstractIncrementalJpsTest() {
             ): Future<Callbacks.ConstantAffection> {
                 // We emulate how constant affection service works in IDEA:
                 // it is able to find Kotlin usages of Java constant, but can't find Java usages of Kotlin constant
-                val affectedFiles = if (ownerClassName == "JavaClass" && fieldName == "CONST") {
-                    listOf(File(workDir, "src/usage.kt"))
-                } else {
-                    emptyList()
-                }
+                val affectedFiles =
+                        when {
+                            ownerClassName == "JavaClass" && fieldName == "CONST" -> listOf(File(workDir, "src/usage.kt"))
+                            ownerClassName == "test.Klass" && fieldName == "CONST" -> listOf(File(workDir, "src/Usage.java"))
+                            else -> emptyList()
+                        }
+
                 return FixedFuture(Callbacks.ConstantAffection(affectedFiles))
             }
         }
diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log b/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log
index 3544758175f..ca359d0908b 100644
--- a/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log
+++ b/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log
@@ -7,7 +7,7 @@ End of files
 Compiling files:
   src/const.kt
 End of files
-Exit code: ADDITIONAL_PASS_REQUIRED
+Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module/Usage.class
diff --git a/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log b/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log
index 3544758175f..ca359d0908b 100644
--- a/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log
+++ b/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log
@@ -7,7 +7,7 @@ End of files
 Compiling files:
   src/const.kt
 End of files
-Exit code: ADDITIONAL_PASS_REQUIRED
+Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module/Usage.class