diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
index 254a7d209bc..dc3279a3245 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
@@ -436,6 +436,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("javaAndKotlinChangedSimultaneously")
+            public void testJavaAndKotlinChangedSimultaneously() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/");
+                doTest(fileName);
+            }
+
             @TestMetadata("methodAddedInSuper")
             public void testMethodAddedInSuper() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/");
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java
new file mode 100644
index 00000000000..3d21230b981
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java
@@ -0,0 +1,4 @@
+public class JavaClass {
+    public void foo() {
+    }
+}
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java.new b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java.new
new file mode 100644
index 00000000000..55262a600a8
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java.new
@@ -0,0 +1,7 @@
+public class JavaClass {
+    public void foo() {
+    }
+
+    public void bar() {
+    }
+}
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log
new file mode 100644
index 00000000000..3a58b62b68c
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log
@@ -0,0 +1,11 @@
+Cleaning output files:
+out/production/module/JavaClass.class
+out/production/module/_DefaultPackage$usage$*.class
+out/production/module/_DefaultPackage.class
+End of files
+Compiling files:
+src/usage.kt
+End of files
+Compiling files:
+src/JavaClass.java
+End of files
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt
new file mode 100644
index 00000000000..8285440f8f2
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt
@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    JavaClass().foo()
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt.new b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt.new
new file mode 100644
index 00000000000..e1200efb2d2
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt.new
@@ -0,0 +1,4 @@
+fun main(args: Array<String>) {
+    JavaClass().foo()
+    JavaClass().bar()
+}
\ No newline at end of file