diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java b/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java
index c5f8c7d5ffff..0afcd94d2f12 100644
--- a/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java
+++ b/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java
@@ -400,6 +400,7 @@ public abstract class JavaFoldingBuilderBase extends CustomFoldingBuilder implem
     }
 
     addFoldsForFileHeader(descriptors, file, document);
+    addCommentsToFold(descriptors, root, document, processedComments);
   }
 
   private static void addFoldsForImports(@NotNull List<? super FoldingDescriptor> list, @NotNull PsiJavaFile file) {
diff --git a/java/java-tests/testData/codeInsight/folding/MultilineComments.java b/java/java-tests/testData/codeInsight/folding/MultilineComments.java
index 75c0fcdc58b3..98d1f9d5bc0f 100644
--- a/java/java-tests/testData/codeInsight/folding/MultilineComments.java
+++ b/java/java-tests/testData/codeInsight/folding/MultilineComments.java
@@ -1,6 +1,26 @@
+<fold text='/.../'>/*
+file header comment
+ */</fold>
+
+package test;
+  <fold text='/*...*/'>/*
+outer class comment
+ */</fold>
+
+<fold text='//...'>//outer class
+//consequent EOL comments</fold>
+
+import java.util.List;
 <fold text='/*...*/'>/*
 outer class comment
  */</fold>
+
+<fold text='//...'>//outer class
+//consequent EOL comments</fold>
+
+<fold text='/*...*/'>/*
+before class comment
+ */</fold>
 class Test {
   <fold text='/*...*/'>/*
   dangling multiline commnent
@@ -41,4 +61,9 @@ class Test {
       }</fold>
     }</fold>
   }</fold>
-}
\ No newline at end of file
+}
+<fold text='/*...*/'>/*
+after class comment
+ */</fold>
+<fold text='//...'>// after class
+//consequent EOL comments</fold>
\ No newline at end of file