diff --git a/java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement.java b/java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement.java
new file mode 100644
index 000000000000..920af07443d0
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement.java
@@ -0,0 +1,11 @@
+package org.example;
+
+import org.jetbrains.annotations.NotNull;
+
+public class ClassWithAnnotations {
+    private static final Boolean SIMPLE_FIELD = false;
+    @NotNull public static final Boolean ANOTHER_ANNOTATED_FIELD = false;
+    @NotNull public static final Boolean ANNOTATED_FIELD = false;
+    private @NotNull Boolean annotatedField = false;
+    public Boolean simpleField = false;
+}
diff --git a/java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement_after.java b/java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement_after.java
new file mode 100644
index 000000000000..ccce472fb37e
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement_after.java
@@ -0,0 +1,20 @@
+package org.example;
+
+import org.jetbrains.annotations.NotNull;
+
+public class ClassWithAnnotations {
+    private static final Boolean SIMPLE_FIELD = false;
+
+
+    @NotNull
+    public static final Boolean ANOTHER_ANNOTATED_FIELD = false;
+
+
+    @NotNull
+    public static final Boolean ANNOTATED_FIELD = false;
+
+
+    private @NotNull Boolean annotatedField = false;
+
+    public Boolean simpleField = false;
+}
diff --git a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterBlankLinesAroundFieldTest.kt b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterBlankLinesAroundFieldTest.kt
index d89b3bb1c368..721f74d93da4 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterBlankLinesAroundFieldTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterBlankLinesAroundFieldTest.kt
@@ -26,4 +26,12 @@ class JavaFormatterBlankLinesAroundFieldTest : JavaFormatterTestCase() {
     getSettings(JavaLanguage.INSTANCE).BLANK_LINES_AROUND_FIELD = 1
     doTest()
   }
+
+  fun testRearrangement() {
+    getSettings(JavaLanguage.INSTANCE).BLANK_LINES_AROUND_FIELD = 1
+    val testName = getTestName(true)
+    val afterFileName = "${testName}_after"
+    doTest(testName, afterFileName)
+    doTest(afterFileName, afterFileName)
+  }
 }
\ No newline at end of file