diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt
index 6b47071ae27..343e814fa96 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt
@@ -16,13 +16,11 @@
 
 package org.jetbrains.jet.jps.build
 
-import org.jetbrains.ether.IncrementalTestCase
 import org.jetbrains.jps.builders.JpsBuildTestCase
 import kotlin.properties.Delegates
 import com.intellij.openapi.util.io.FileUtil
 import java.io.File
 import org.jetbrains.jps.builders.CompileScopeTestBuilder
-import org.jetbrains.jps.builders.BuildResult
 import org.jetbrains.jps.builders.impl.logging.ProjectBuilderLoggerBase
 import org.jetbrains.jps.builders.logging.BuildLoggingManager
 import org.jetbrains.jps.model.java.JpsJavaExtensionService
@@ -120,6 +118,14 @@ public class IncrementalJpsTest : JpsBuildTestCase() {
         doTest()
     }
 
+    fun testConstantValue() {
+        doTest()
+    }
+
+    fun testConstantUnchanged() {
+        doTest()
+    }
+
     private class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase() {
         private val logBuf = StringBuilder()
         public val log: String
diff --git a/jps/jps-plugin/testData/incremental/constantUnchanged/build.log b/jps/jps-plugin/testData/incremental/constantUnchanged/build.log
new file mode 100644
index 00000000000..dad2c9128da
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/constantUnchanged/build.log
@@ -0,0 +1,7 @@
+Cleaning output files:
+out/production/module/test/TestPackage-const-*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/const.kt
+End of files
diff --git a/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt b/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt
new file mode 100644
index 00000000000..1572968f89f
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt
@@ -0,0 +1,3 @@
+package test
+
+val CONST = "foo"
diff --git a/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt.new b/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt.new
new file mode 100644
index 00000000000..1572968f89f
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt.new
@@ -0,0 +1,3 @@
+package test
+
+val CONST = "foo"
diff --git a/jps/jps-plugin/testData/incremental/constantUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/constantUnchanged/usage.kt
new file mode 100644
index 00000000000..cb0f4ce8687
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/constantUnchanged/usage.kt
@@ -0,0 +1,4 @@
+package test
+
+deprecated(CONST + CONST)
+class Usage
diff --git a/jps/jps-plugin/testData/incremental/constantValue/build.log b/jps/jps-plugin/testData/incremental/constantValue/build.log
new file mode 100644
index 00000000000..dbdb31fbbf0
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/constantValue/build.log
@@ -0,0 +1,13 @@
+Cleaning output files:
+out/production/module/test/TestPackage-const-*.class
+out/production/module/test/TestPackage.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/jps-plugin/testData/incremental/constantValue/const.kt b/jps/jps-plugin/testData/incremental/constantValue/const.kt
new file mode 100644
index 00000000000..1572968f89f
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/constantValue/const.kt
@@ -0,0 +1,3 @@
+package test
+
+val CONST = "foo"
diff --git a/jps/jps-plugin/testData/incremental/constantValue/const.kt.new b/jps/jps-plugin/testData/incremental/constantValue/const.kt.new
new file mode 100644
index 00000000000..c94f1955d6d
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/constantValue/const.kt.new
@@ -0,0 +1,3 @@
+package test
+
+val CONST = "bar"
diff --git a/jps/jps-plugin/testData/incremental/constantValue/usage.kt b/jps/jps-plugin/testData/incremental/constantValue/usage.kt
new file mode 100644
index 00000000000..cb0f4ce8687
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/constantValue/usage.kt
@@ -0,0 +1,4 @@
+package test
+
+deprecated(CONST + CONST)
+class Usage