diff --git a/java-checks-test-sources/default/src/main/java/checks/IndentationCheck_compactSource.java b/java-checks-test-sources/default/src/main/java/checks/IndentationCheck_compactSource.java
index 086bb6f951..8e7975a891 100644
--- a/java-checks-test-sources/default/src/main/java/checks/IndentationCheck_compactSource.java
+++ b/java-checks-test-sources/default/src/main/java/checks/IndentationCheck_compactSource.java
@@ -1,11 +1,29 @@
-// SONARJAVA-6028: FPs ahead. Only the line with "Too much." should be noncompliant.
-
-void main() { // Noncompliant
-  System.out.println("Just right."); // Noncompliant
+void main() {
+  System.out.println("Just right.");
   if (true) {
         System.out.println("Too much."); // Noncompliant
   }
 }
 
-class MyClass { // Noncompliant
+class MyClass {
+  void myMethod() {
+    System.err.println("Error message");
+  }
+
+  static private class MyNestedClass {
+    private final static int VALUE = 42;
+    public float pi = 3.14f;
+      public String badlyIndentedField = "Oops"; // Noncompliant
+      public String secondBadlyIndentedField = "Oops x 2"; // Compliant, raised on previous line
+
+
+    void anotherMethod() {
+      System.out.println("Nested class output");
+    }
+  }
 }
+
+int i = 0;
+  public String badlyIndentedField = "Oops"; // Noncompliant
+  public String secondBadlyIndentedField = "Oops x 2"; // Compliant, raised on previous line
+int j = 0;
diff --git a/java-checks/src/main/java/org/sonar/java/checks/IndentationCheck.java b/java-checks/src/main/java/org/sonar/java/checks/IndentationCheck.java
index 991725c5fb..a5330a8b08 100644
--- a/java-checks/src/main/java/org/sonar/java/checks/IndentationCheck.java
+++ b/java-checks/src/main/java/org/sonar/java/checks/IndentationCheck.java
@@ -82,7 +82,9 @@ public void visitClass(ClassTree tree) {
       excludeIssueAtLine = LineUtils.startLine(tree.openBraceToken());
       expectedLevel = Position.startOf(tree.closeBraceToken()).columnOffset();
     }
-    newBlock();
+    if (!tree.is(Kind.IMPLICIT_CLASS)) {
+      newBlock();
+    }
     checkIndentation(tree.members());
     super.visitClass(tree);
     leaveNode(tree);