diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
index 8c82d571c63..a0845818323 100644
--- a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
@@ -323,6 +323,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
                 doTest(fileName);
             }
             
+            @TestMetadata("constantChanged")
+            public void testConstantChanged() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/");
+                doTest(fileName);
+            }
+            
+            @TestMetadata("constantUnchanged")
+            public void testConstantUnchanged() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/");
+                doTest(fileName);
+            }
+            
             @TestMetadata("notChangeSignature")
             public void testNotChangeSignature() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/");
@@ -352,6 +364,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
                 doTest(fileName);
             }
             
+            @TestMetadata("constantChanged")
+            public void testConstantChanged() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/");
+                doTest(fileName);
+            }
+            
+            @TestMetadata("constantUnchanged")
+            public void testConstantUnchanged() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/");
+                doTest(fileName);
+            }
+            
             @TestMetadata("notChangeSignature")
             public void testNotChangeSignature() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/");
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java
new file mode 100644
index 00000000000..888f27db4e3
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java
@@ -0,0 +1,3 @@
+public class JavaClass {
+    public static final String CONST = "A";
+}
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new
new file mode 100644
index 00000000000..96ac5cb2bca
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new
@@ -0,0 +1,3 @@
+public class JavaClass {
+    public static final String CONST = "B";
+}
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log
new file mode 100644
index 00000000000..340fdbba3b4
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log
@@ -0,0 +1,16 @@
+Cleaning output files:
+out/production/module/JavaClass.class
+End of files
+Compiling files:
+src/JavaClass.java
+End of files
+Cleaning output files:
+out/production/module/JavaClass.class
+out/production/module/Usage.class
+End of files
+Compiling files:
+src/usage.kt
+End of files
+Compiling files:
+src/JavaClass.java
+End of files
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt
new file mode 100644
index 00000000000..9f972262826
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt
@@ -0,0 +1,2 @@
+deprecated(JavaClass.CONST + JavaClass.CONST)
+class Usage
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java
new file mode 100644
index 00000000000..888f27db4e3
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java
@@ -0,0 +1,3 @@
+public class JavaClass {
+    public static final String CONST = "A";
+}
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.new b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.new
new file mode 100644
index 00000000000..888f27db4e3
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.new
@@ -0,0 +1,3 @@
+public class JavaClass {
+    public static final String CONST = "A";
+}
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log
new file mode 100644
index 00000000000..1cefb7c31b1
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log
@@ -0,0 +1,6 @@
+Cleaning output files:
+out/production/module/JavaClass.class
+End of files
+Compiling files:
+src/JavaClass.java
+End of files
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt
new file mode 100644
index 00000000000..9f972262826
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt
@@ -0,0 +1,2 @@
+deprecated(JavaClass.CONST + JavaClass.CONST)
+class Usage
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/Usage.java b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/Usage.java
new file mode 100644
index 00000000000..9430b8d5f66
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/Usage.java
@@ -0,0 +1,7 @@
+import test.*;
+
+class Usage {
+    public static void main(String[] args) {
+        System.out.println(Klass.CONST + Klass.CONST);
+    }
+}
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log
new file mode 100644
index 00000000000..78e27d0e4e4
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log
@@ -0,0 +1,18 @@
+Cleaning output files:
+out/production/module/test/Klass$object.class
+out/production/module/test/Klass.class
+End of files
+Compiling files:
+src/const.kt
+End of files
+Cleaning output files:
+out/production/module/Usage.class
+out/production/module/test/Klass$object.class
+out/production/module/test/Klass.class
+End of files
+Compiling files:
+src/const.kt
+End of files
+Compiling files:
+src/Usage.java
+End of files
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt
new file mode 100644
index 00000000000..a3b30360e52
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt
@@ -0,0 +1,8 @@
+package test
+
+class Klass {
+    class object {
+        // Old and new constant values are different, but their hashes are the same
+        val CONST = "BF"
+    }
+}
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new
new file mode 100644
index 00000000000..8835b725265
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new
@@ -0,0 +1,8 @@
+package test
+
+class Klass {
+    class object {
+        // Old and new constant values are different, but their hashes are the same
+        val CONST = "Ae"
+    }
+}
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/Usage.java b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/Usage.java
new file mode 100644
index 00000000000..9430b8d5f66
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/Usage.java
@@ -0,0 +1,7 @@
+import test.*;
+
+class Usage {
+    public static void main(String[] args) {
+        System.out.println(Klass.CONST + Klass.CONST);
+    }
+}
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log
new file mode 100644
index 00000000000..026ae147f5a
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log
@@ -0,0 +1,7 @@
+Cleaning output files:
+out/production/module/test/Klass$object.class
+out/production/module/test/Klass.class
+End of files
+Compiling files:
+src/const.kt
+End of files
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt
new file mode 100644
index 00000000000..b13ee1c3c3b
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt
@@ -0,0 +1,7 @@
+package test
+
+class Klass {
+    class object {
+        val CONST = "bar"
+    }
+}
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new
new file mode 100644
index 00000000000..b13ee1c3c3b
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new
@@ -0,0 +1,7 @@
+package test
+
+class Klass {
+    class object {
+        val CONST = "bar"
+    }
+}