diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/intNonStaticConstantChange.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/intNonStaticConstantChange.log
new file mode 100644
index 000000000000..6785cb00a98b
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/fieldProperties/intNonStaticConstantChange.log
@@ -0,0 +1,12 @@
+Cleaning output files:
+out/production/IntNonStaticConstantChange/Server.class
+End of files
+Compiling files:
+src/Server.java
+End of files
+Cleaning output files:
+out/production/IntNonStaticConstantChange/Client.class
+End of files
+Compiling files:
+src/Client.java
+End of files
diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/intNonStaticConstantChange/Server.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/intNonStaticConstantChange/Server.java.new
new file mode 100644
index 000000000000..6bf139a9035b
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/fieldProperties/intNonStaticConstantChange/Server.java.new
@@ -0,0 +1,3 @@
+class Server {
+  final int var = 500;
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/intNonStaticConstantChange/src/Client.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/intNonStaticConstantChange/src/Client.java
new file mode 100644
index 000000000000..3a73a3fb1795
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/fieldProperties/intNonStaticConstantChange/src/Client.java
@@ -0,0 +1,5 @@
+class Client {
+  public static void main(String[] args) {
+    System.out.println(new Server().var);
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/intNonStaticConstantChange/src/Server.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/intNonStaticConstantChange/src/Server.java
new file mode 100644
index 000000000000..123c7e6b0a13
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/fieldProperties/intNonStaticConstantChange/src/Server.java
@@ -0,0 +1,3 @@
+class Server {
+  final int var = 100;
+}
\ No newline at end of file
diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java
index cb8a777774d7..f652c17448e6 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java
@@ -799,7 +799,7 @@ public class Mappings {
   }
 
   private class Differential {
-    private static final int DESPERATE_MASK = Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
+    private static final int DESPERATE_MASK = Opcodes.ACC_FINAL;
 
     final Mappings myDelta;
     final Collection<File> myFilesToCompile;
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/FieldPropertyTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/FieldPropertyTest.java
index 918f1213a1ad..aa99a68c8dd0 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/FieldPropertyTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/FieldPropertyTest.java
@@ -60,6 +60,10 @@ public class FieldPropertyTest extends IncrementalTestCase {
     doTest();
   }
 
+  public void testIntNonStaticConstantChange() throws Exception {
+    doTest();
+  }
+
   public void testLongConstantChange() throws Exception {
     doTest();
   }