diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
index 99e59a204cc..b3da1e07334 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
@@ -807,6 +807,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta
                 doTest(fileName);
             }
 
+            @TestMetadata("enumEntryAdded")
+            public void testEnumEntryAdded() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/");
+                doTest(fileName);
+            }
+
+            @TestMetadata("enumEntryRemoved")
+            public void testEnumEntryRemoved() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/");
+                doTest(fileName);
+            }
+
             @TestMetadata("javaAndKotlinChangedSimultaneously")
             public void testJavaAndKotlinChangedSimultaneously() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/");
@@ -1123,6 +1135,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta
             doTest(fileName);
         }
 
+        @TestMetadata("enumEntryRemoved")
+        public void testEnumEntryRemoved() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/");
+            doTest(fileName);
+        }
+
         @TestMetadata("enumMemberChanged")
         public void testEnumMemberChanged() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/");
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 80c2bd6ca57..2e2da5f5f72 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
@@ -807,6 +807,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("enumEntryAdded")
+            public void testEnumEntryAdded() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/");
+                doTest(fileName);
+            }
+
+            @TestMetadata("enumEntryRemoved")
+            public void testEnumEntryRemoved() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/");
+                doTest(fileName);
+            }
+
             @TestMetadata("javaAndKotlinChangedSimultaneously")
             public void testJavaAndKotlinChangedSimultaneously() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/");
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt
new file mode 100644
index 00000000000..d8b67e71746
--- /dev/null
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt
@@ -0,0 +1,5 @@
+enum class Enum {
+    A,
+    B,
+    C
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt.new.1
new file mode 100644
index 00000000000..8e80c9708b0
--- /dev/null
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt.new.1
@@ -0,0 +1,4 @@
+enum class Enum {
+    A,
+    B
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log
new file mode 100644
index 00000000000..41bafdcc2fb
--- /dev/null
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log
@@ -0,0 +1,43 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/Enum.class
+End of files
+Compiling files:
+  src/Enum.kt
+End of files
+Marked as dirty by Kotlin:
+  src/getRandomEnumEntry.kt
+  src/use.kt
+  src/useEnumImplicitly.kt
+Exit code: ADDITIONAL_PASS_REQUIRED
+------------------------------------------
+Cleaning output files:
+  out/production/module/GetRandomEnumEntryKt.class
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/UseEnumImplicitlyKt.class
+  out/production/module/UseKt.class
+End of files
+Compiling files:
+  src/getRandomEnumEntry.kt
+  src/use.kt
+  src/useEnumImplicitly.kt
+End of files
+Exit code: ABORT
+------------------------------------------
+COMPILATION FAILED
+Unresolved reference: C
+
+================ Step #2 =================
+
+Cleaning output files:
+  out/production/module/Enum.class
+End of files
+Compiling files:
+  src/Enum.kt
+  src/getRandomEnumEntry.kt
+  src/use.kt
+  src/useEnumImplicitly.kt
+End of files
+Exit code: OK
+------------------------------------------
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt
new file mode 100644
index 00000000000..2845b19351c
--- /dev/null
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt
@@ -0,0 +1,6 @@
+import java.util.Random
+
+fun getRandomEnumEntry() =
+        with (Enum.values()) {
+            get(Random().nextInt(size))
+        }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt
new file mode 100644
index 00000000000..d64d3769328
--- /dev/null
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt
@@ -0,0 +1,8 @@
+import Enum.*
+
+fun use(e: Enum): String =
+        when (e) {
+            A -> "A"
+            B -> "B"
+            C -> "C"
+        }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt.new.2
new file mode 100644
index 00000000000..14d2aa5be07
--- /dev/null
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt.new.2
@@ -0,0 +1,7 @@
+import Enum.*
+
+fun use(e: Enum): String =
+        when (e) {
+            A -> "A"
+            B -> "B"
+        }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/useEnumImplicitly.kt b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/useEnumImplicitly.kt
new file mode 100644
index 00000000000..d5ad0b4c83a
--- /dev/null
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/useEnumImplicitly.kt
@@ -0,0 +1,3 @@
+fun useImplicit() {
+    println(use(getRandomEnumEntry()))
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java
new file mode 100644
index 00000000000..a5b25884ea6
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java
@@ -0,0 +1,4 @@
+public enum Enum {
+    A,
+    B
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java.new.1 b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java.new.1
new file mode 100644
index 00000000000..dc41c6883d8
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java.new.1
@@ -0,0 +1,5 @@
+public enum Enum {
+    A,
+    B,
+    C
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log
new file mode 100644
index 00000000000..43d2c5501a4
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log
@@ -0,0 +1,22 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/Enum.class
+End of files
+Exit code: NOTHING_DONE
+------------------------------------------
+Compiling files:
+  src/Enum.java
+End of files
+
+================ Step #2 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/UseKt.class
+End of files
+Compiling files:
+  src/use.kt
+End of files
+Exit code: OK
+------------------------------------------
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/getRandomEnumEntry.kt b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/getRandomEnumEntry.kt
new file mode 100644
index 00000000000..2845b19351c
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/getRandomEnumEntry.kt
@@ -0,0 +1,6 @@
+import java.util.Random
+
+fun getRandomEnumEntry() =
+        with (Enum.values()) {
+            get(Random().nextInt(size))
+        }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt
new file mode 100644
index 00000000000..14d2aa5be07
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt
@@ -0,0 +1,7 @@
+import Enum.*
+
+fun use(e: Enum): String =
+        when (e) {
+            A -> "A"
+            B -> "B"
+        }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt.new.2 b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt.new.2
new file mode 100644
index 00000000000..d64d3769328
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt.new.2
@@ -0,0 +1,8 @@
+import Enum.*
+
+fun use(e: Enum): String =
+        when (e) {
+            A -> "A"
+            B -> "B"
+            C -> "C"
+        }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/useEnumImplicitly.kt b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/useEnumImplicitly.kt
new file mode 100644
index 00000000000..d5ad0b4c83a
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/useEnumImplicitly.kt
@@ -0,0 +1,3 @@
+fun useImplicit() {
+    println(use(getRandomEnumEntry()))
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java
new file mode 100644
index 00000000000..dc41c6883d8
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java
@@ -0,0 +1,5 @@
+public enum Enum {
+    A,
+    B,
+    C
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java.new.1 b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java.new.1
new file mode 100644
index 00000000000..a5b25884ea6
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java.new.1
@@ -0,0 +1,4 @@
+public enum Enum {
+    A,
+    B
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log
new file mode 100644
index 00000000000..fbad2c8600c
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log
@@ -0,0 +1,35 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/Enum.class
+End of files
+Exit code: NOTHING_DONE
+------------------------------------------
+Compiling files:
+  src/Enum.java
+End of files
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/UseKt.class
+End of files
+Compiling files:
+  src/use.kt
+End of files
+Exit code: ABORT
+------------------------------------------
+COMPILATION FAILED
+Unresolved reference: C
+
+================ Step #2 =================
+
+Cleaning output files:
+  out/production/module/Enum.class
+End of files
+Compiling files:
+  src/use.kt
+End of files
+Exit code: OK
+------------------------------------------
+Compiling files:
+  src/Enum.java
+End of files
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/getRandomEnumEntry.kt b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/getRandomEnumEntry.kt
new file mode 100644
index 00000000000..2845b19351c
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/getRandomEnumEntry.kt
@@ -0,0 +1,6 @@
+import java.util.Random
+
+fun getRandomEnumEntry() =
+        with (Enum.values()) {
+            get(Random().nextInt(size))
+        }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt
new file mode 100644
index 00000000000..d64d3769328
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt
@@ -0,0 +1,8 @@
+import Enum.*
+
+fun use(e: Enum): String =
+        when (e) {
+            A -> "A"
+            B -> "B"
+            C -> "C"
+        }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt.new.2 b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt.new.2
new file mode 100644
index 00000000000..14d2aa5be07
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt.new.2
@@ -0,0 +1,7 @@
+import Enum.*
+
+fun use(e: Enum): String =
+        when (e) {
+            A -> "A"
+            B -> "B"
+        }
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/useEnumImplicitly.kt b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/useEnumImplicitly.kt
new file mode 100644
index 00000000000..d5ad0b4c83a
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/useEnumImplicitly.kt
@@ -0,0 +1,3 @@
+fun useImplicit() {
+    println(use(getRandomEnumEntry()))
+}
\ No newline at end of file