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 0ba2e825c09..bb880f3439f 100644
--- a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
@@ -86,9 +86,9 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
         doTest("jps-plugin/testData/incremental/classSignatureUnchanged/");
     }
     
-    @TestMetadata("constantUnchanged")
-    public void testConstantUnchanged() throws Exception {
-        doTest("jps-plugin/testData/incremental/constantUnchanged/");
+    @TestMetadata("constantsUnchanged")
+    public void testConstantsUnchanged() throws Exception {
+        doTest("jps-plugin/testData/incremental/constantsUnchanged/");
     }
     
     @TestMetadata("dependencyClassReferenced")
diff --git a/jps-plugin/testData/incremental/constantUnchanged/const.kt b/jps-plugin/testData/incremental/constantUnchanged/const.kt
deleted file mode 100644
index 1572968f89f..00000000000
--- a/jps-plugin/testData/incremental/constantUnchanged/const.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-val CONST = "foo"
diff --git a/jps-plugin/testData/incremental/constantUnchanged/const.kt.new b/jps-plugin/testData/incremental/constantUnchanged/const.kt.new
deleted file mode 100644
index 1572968f89f..00000000000
--- a/jps-plugin/testData/incremental/constantUnchanged/const.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-val CONST = "foo"
diff --git a/jps-plugin/testData/incremental/constantUnchanged/usage.kt b/jps-plugin/testData/incremental/constantUnchanged/usage.kt
deleted file mode 100644
index cb0f4ce8687..00000000000
--- a/jps-plugin/testData/incremental/constantUnchanged/usage.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-deprecated(CONST + CONST)
-class Usage
diff --git a/jps-plugin/testData/incremental/constantUnchanged/build.log b/jps-plugin/testData/incremental/constantsUnchanged/build.log
similarity index 67%
rename from jps-plugin/testData/incremental/constantUnchanged/build.log
rename to jps-plugin/testData/incremental/constantsUnchanged/build.log
index dad2c9128da..7e364968874 100644
--- a/jps-plugin/testData/incremental/constantUnchanged/build.log
+++ b/jps-plugin/testData/incremental/constantsUnchanged/build.log
@@ -1,4 +1,6 @@
 Cleaning output files:
+out/production/module/test/Klass$object.class
+out/production/module/test/Klass.class
 out/production/module/test/TestPackage-const-*.class
 out/production/module/test/TestPackage.class
 End of files
diff --git a/jps-plugin/testData/incremental/constantsUnchanged/const.kt b/jps-plugin/testData/incremental/constantsUnchanged/const.kt
new file mode 100644
index 00000000000..8261acd68a1
--- /dev/null
+++ b/jps-plugin/testData/incremental/constantsUnchanged/const.kt
@@ -0,0 +1,9 @@
+package test
+
+val CONST = "foo"
+
+class Klass {
+    class object {
+        val CONST = "bar"
+    }
+}
diff --git a/jps-plugin/testData/incremental/constantsUnchanged/const.kt.new b/jps-plugin/testData/incremental/constantsUnchanged/const.kt.new
new file mode 100644
index 00000000000..8261acd68a1
--- /dev/null
+++ b/jps-plugin/testData/incremental/constantsUnchanged/const.kt.new
@@ -0,0 +1,9 @@
+package test
+
+val CONST = "foo"
+
+class Klass {
+    class object {
+        val CONST = "bar"
+    }
+}
diff --git a/jps-plugin/testData/incremental/constantsUnchanged/usage.kt b/jps-plugin/testData/incremental/constantsUnchanged/usage.kt
new file mode 100644
index 00000000000..993031ad991
--- /dev/null
+++ b/jps-plugin/testData/incremental/constantsUnchanged/usage.kt
@@ -0,0 +1,4 @@
+package test
+
+deprecated(CONST + Klass.CONST)
+class Usage