diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
index c9a3da5cc4b..a59e2b192b5 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
@@ -117,6 +117,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
             doTest(fileName);
         }
 
+        @TestMetadata("duplicatedClass")
+        public void testDuplicatedClass() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/duplicatedClass/");
+            doTest(fileName);
+        }
+
         @TestMetadata("exportedDependency")
         public void testExportedDependency() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/exportedDependency/");
diff --git a/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/build.log b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/build.log
new file mode 100644
index 00000000000..917d81caa03
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/build.log
@@ -0,0 +1,17 @@
+================ Step #1 =================
+
+Building module1
+Exit code: NOTHING_DONE
+------------------------------------------
+Building module2
+Cleaning output files:
+  out/production/module2/META-INF/module2.kotlin_module
+  out/production/module2/UseAKt.class
+  out/production/module2/UseUtilsKt.class
+End of files
+Compiling files:
+  module2/src/useA.kt
+  module2/src/useUtils.kt
+End of files
+Exit code: OK
+------------------------------------------
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/dependencies.txt
new file mode 100644
index 00000000000..827bf04cc58
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/dependencies.txt
@@ -0,0 +1,2 @@
+module1->
+module2->module1
diff --git a/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module1_A.kt b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module1_A.kt
new file mode 100644
index 00000000000..2f1a23c74eb
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module1_A.kt
@@ -0,0 +1,3 @@
+class A {
+    fun fizz() {}
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module1_other1.kt b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module1_other1.kt
new file mode 100644
index 00000000000..76612dffc16
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module1_other1.kt
@@ -0,0 +1,2 @@
+fun other1() {
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module1_utils.kt b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module1_utils.kt
new file mode 100644
index 00000000000..60843f060c1
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module1_utils.kt
@@ -0,0 +1 @@
+fun fizz() {}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_A.kt b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_A.kt
new file mode 100644
index 00000000000..dd957f79c67
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_A.kt
@@ -0,0 +1,3 @@
+class A {
+    fun buzz() {}
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_other2.kt b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_other2.kt
new file mode 100644
index 00000000000..e7b29d7ffe4
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_other2.kt
@@ -0,0 +1,2 @@
+fun other2() {
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useA.kt b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useA.kt
new file mode 100644
index 00000000000..d662c17f077
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useA.kt
@@ -0,0 +1,3 @@
+fun useA() {
+    A().buzz()
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useA.kt.touch b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useA.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useUtils.kt b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useUtils.kt
new file mode 100644
index 00000000000..11202c9b2f6
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useUtils.kt
@@ -0,0 +1,3 @@
+fun useUtils() {
+    buzz()
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useUtils.kt.touch b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_useUtils.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_utils.kt b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_utils.kt
new file mode 100644
index 00000000000..ed02bf9e14f
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiModule/duplicatedClass/module2_utils.kt
@@ -0,0 +1 @@
+fun buzz() {}
\ No newline at end of file