diff --git a/.checkstyle.xml b/.checkstyle.xml
index b92fc345..112a3a0b 100644
--- a/.checkstyle.xml
+++ b/.checkstyle.xml
@@ -150,24 +150,24 @@
         </module>
         <module name="JavadocMethod">
             <property name="scope" value="package"/>
-            <property name="allowedAnnotations" value="Override, Test, SectionComments, EventHandler, Before, BeforeClass"/>
+            <property name="allowedAnnotations" value="Override, EventHandler"/>
             <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/> <!-- exclude CTOR_DEF -->
         </module>
         <module name="MissingJavadocMethod">
             <property name="scope" value="package"/>
             <property name="minLineCount" value="4"/>
-            <property name="allowedAnnotations" value="Override, Test, SectionComments, EventHandler, Before, BeforeClass"/>
+            <property name="allowedAnnotations" value="Override, EventHandler"/>
             <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/> <!-- exclude CTOR_DEF -->
         </module>
         <module name="JavadocMethod">
             <property name="scope" value="private"/>
-            <property name="allowedAnnotations" value="Override, Test, SectionComments, EventHandler"/>
+            <property name="allowedAnnotations" value="Override, EventHandler"/>
             <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/> <!-- exclude CTOR_DEF -->
         </module>
         <module name="MissingJavadocMethod">
             <property name="scope" value="private"/>
             <property name="minLineCount" value="16"/>
-            <property name="allowedAnnotations" value="Override, Test, SectionComments, EventHandler"/>
+            <property name="allowedAnnotations" value="Override, EventHandler"/>
             <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/> <!-- exclude CTOR_DEF -->
         </module>
         <!-- TODO Checkstyle/#4089: need "allowedAnnotations" property to skip @Comment fields