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 40920fdd674..0ba2e825c09 100644
--- a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
@@ -66,6 +66,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
         doTest("jps-plugin/testData/incremental/classInlineFunctionUnchanged/");
     }
     
+    @TestMetadata("classObjectConstantChanged")
+    public void testClassObjectConstantChanged() throws Exception {
+        doTest("jps-plugin/testData/incremental/classObjectConstantChanged/");
+    }
+    
     @TestMetadata("classRecreated")
     public void testClassRecreated() throws Exception {
         doTest("jps-plugin/testData/incremental/classRecreated/");
@@ -86,11 +91,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
         doTest("jps-plugin/testData/incremental/constantUnchanged/");
     }
     
-    @TestMetadata("constantValue")
-    public void testConstantValue() throws Exception {
-        doTest("jps-plugin/testData/incremental/constantValue/");
-    }
-    
     @TestMetadata("dependencyClassReferenced")
     public void testDependencyClassReferenced() throws Exception {
         doTest("jps-plugin/testData/incremental/dependencyClassReferenced/");
@@ -121,6 +121,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
         doTest("jps-plugin/testData/incremental/ourClassReferenced/");
     }
     
+    @TestMetadata("packageConstantChanged")
+    public void testPackageConstantChanged() throws Exception {
+        doTest("jps-plugin/testData/incremental/packageConstantChanged/");
+    }
+    
     @TestMetadata("packageFileAdded")
     public void testPackageFileAdded() throws Exception {
         doTest("jps-plugin/testData/incremental/packageFileAdded/");
@@ -150,7 +155,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
     public void testPackageInlineFunctionAccessingField() throws Exception {
         doTest("jps-plugin/testData/incremental/packageInlineFunctionAccessingField/");
     }
-
+    
     @TestMetadata("packageInlineFunctionChanged")
     public void testPackageInlineFunctionChanged() throws Exception {
         doTest("jps-plugin/testData/incremental/packageInlineFunctionChanged/");
diff --git a/jps-plugin/testData/incremental/classObjectConstantChanged/build.log b/jps-plugin/testData/incremental/classObjectConstantChanged/build.log
new file mode 100644
index 00000000000..0d4503b9825
--- /dev/null
+++ b/jps-plugin/testData/incremental/classObjectConstantChanged/build.log
@@ -0,0 +1,13 @@
+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/test/Usage.class
+End of files
+Compiling files:
+src/usage.kt
+End of files
diff --git a/jps-plugin/testData/incremental/classObjectConstantChanged/const.kt b/jps-plugin/testData/incremental/classObjectConstantChanged/const.kt
new file mode 100644
index 00000000000..a3b30360e52
--- /dev/null
+++ b/jps-plugin/testData/incremental/classObjectConstantChanged/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/classObjectConstantChanged/const.kt.new b/jps-plugin/testData/incremental/classObjectConstantChanged/const.kt.new
new file mode 100644
index 00000000000..8835b725265
--- /dev/null
+++ b/jps-plugin/testData/incremental/classObjectConstantChanged/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/classObjectConstantChanged/usage.kt b/jps-plugin/testData/incremental/classObjectConstantChanged/usage.kt
new file mode 100644
index 00000000000..92fe20c977b
--- /dev/null
+++ b/jps-plugin/testData/incremental/classObjectConstantChanged/usage.kt
@@ -0,0 +1,4 @@
+package test
+
+deprecated(Klass.CONST + Klass.CONST)
+class Usage
diff --git a/jps-plugin/testData/incremental/constantValue/build.log b/jps-plugin/testData/incremental/packageConstantChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/constantValue/build.log
rename to jps-plugin/testData/incremental/packageConstantChanged/build.log
diff --git a/jps-plugin/testData/incremental/constantValue/const.kt b/jps-plugin/testData/incremental/packageConstantChanged/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/constantValue/const.kt
rename to jps-plugin/testData/incremental/packageConstantChanged/const.kt
diff --git a/jps-plugin/testData/incremental/constantValue/const.kt.new b/jps-plugin/testData/incremental/packageConstantChanged/const.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/constantValue/const.kt.new
rename to jps-plugin/testData/incremental/packageConstantChanged/const.kt.new
diff --git a/jps-plugin/testData/incremental/constantValue/usage.kt b/jps-plugin/testData/incremental/packageConstantChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/constantValue/usage.kt
rename to jps-plugin/testData/incremental/packageConstantChanged/usage.kt