diff --git a/config/checker-framework-suppressions/checker-nullness-optional-interning-suppressions.xml b/config/checker-framework-suppressions/checker-nullness-optional-interning-suppressions.xml
index fe7ca14291c..a1e0f5e8b5b 100644
--- a/config/checker-framework-suppressions/checker-nullness-optional-interning-suppressions.xml
+++ b/config/checker-framework-suppressions/checker-nullness-optional-interning-suppressions.xml
@@ -4279,13 +4279,6 @@
     <lineContent>private Pattern versionFormat;</lineContent>
   </checkerFrameworkError>
 
-  <checkerFrameworkError unstable="false">
-    <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.java</fileName>
-    <specifier>initialization.field.uninitialized</specifier>
-    <message>the default constructor does not initialize field excludeScope</message>
-    <lineContent>private Scope excludeScope;</lineContent>
-  </checkerFrameworkError>
-
   <checkerFrameworkError unstable="false">
     <fileName>src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.java</fileName>
     <specifier>initialization.field.uninitialized</specifier>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.java
index df40b49a0f2..e2bed422166 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.java
@@ -19,15 +19,17 @@
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
+import java.util.Arrays;
 import java.util.regex.Pattern;
 
 import com.puppycrawl.tools.checkstyle.StatelessCheck;
 import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.FileContents;
-import com.puppycrawl.tools.checkstyle.api.Scope;
 import com.puppycrawl.tools.checkstyle.api.TextBlock;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+import com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption;
+import com.puppycrawl.tools.checkstyle.utils.CheckUtil;
 import com.puppycrawl.tools.checkstyle.utils.ScopeUtil;
 
 /**
@@ -36,10 +38,10 @@
  * </div>
  * <ul>
  * <li>
- * Property {@code excludeScope} - Specify the visibility scope where Javadoc
- * comments are not checked.
- * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
- * Default value is {@code null}.
+ * Property {@code accessModifiers} - Access modifiers of methods where parameters are
+ * checked.
+ * Type is {@code com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption[]}.
+ * Default value is {@code public, protected, package, private}.
  * </li>
  * <li>
  * Property {@code ignoreNamePattern} - Specify the regexp to define variable names to ignore.
@@ -47,11 +49,6 @@
  * Default value is {@code null}.
  * </li>
  * <li>
- * Property {@code scope} - Specify the visibility scope where Javadoc comments are checked.
- * Type is {@code com.puppycrawl.tools.checkstyle.api.Scope}.
- * Default value is {@code private}.
- * </li>
- * <li>
  * Property {@code tokens} - tokens to check
  * Type is {@code java.lang.String[]}.
  * Validation type is {@code tokenSet}.
@@ -84,35 +81,28 @@ public class JavadocVariableCheck
      * A key is pointing to the warning message text in "messages.properties"
      * file.
      */
-    public static final String MSG_JAVADOC_MISSING = "javadoc.missing";
-
-    /** Specify the visibility scope where Javadoc comments are checked. */
-    private Scope scope = Scope.PRIVATE;
 
-    /** Specify the visibility scope where Javadoc comments are not checked. */
-    private Scope excludeScope;
+    public static final String MSG_JAVADOC_MISSING = "javadoc.missing";
+    /** Access modifiers of methods where parameters are checked. */
+    private AccessModifierOption[] accessModifiers = {
+        AccessModifierOption.PUBLIC,
+        AccessModifierOption.PROTECTED,
+        AccessModifierOption.PACKAGE,
+        AccessModifierOption.PRIVATE,
+    };
 
     /** Specify the regexp to define variable names to ignore. */
     private Pattern ignoreNamePattern;
 
     /**
-     * Setter to specify the visibility scope where Javadoc comments are checked.
+     * Setter to access modifiers of methods where parameters are checked.
      *
-     * @param scope a scope.
-     * @since 3.0
+     * @param accessModifiers access modifiers of methods which should be checked.
+     * @since 11.0.0
      */
-    public void setScope(Scope scope) {
-        this.scope = scope;
-    }
-
-    /**
-     * Setter to specify the visibility scope where Javadoc comments are not checked.
-     *
-     * @param excludeScope a scope.
-     * @since 3.4
-     */
-    public void setExcludeScope(Scope excludeScope) {
-        this.excludeScope = excludeScope;
+    public void setAccessModifiers(AccessModifierOption... accessModifiers) {
+        this.accessModifiers =
+            Arrays.copyOf(accessModifiers, accessModifiers.length);
     }
 
     /**
@@ -176,6 +166,17 @@ private boolean isIgnored(DetailAST ast) {
             || "serialVersionUID".equals(name);
     }
 
+    /**
+     * Checks whether a method has the correct access modifier to be checked.
+     *
+     * @param accessModifier the access modifier of the method.
+     * @return whether the method matches the expected access modifier.
+     */
+    private boolean matchAccessModifiers(final AccessModifierOption accessModifier) {
+        return Arrays.stream(accessModifiers)
+            .anyMatch(modifier -> modifier == accessModifier);
+    }
+
     /**
      * Whether we should check this node.
      *
@@ -185,14 +186,15 @@ private boolean isIgnored(DetailAST ast) {
     private boolean shouldCheck(final DetailAST ast) {
         boolean result = false;
         if (!ScopeUtil.isInCodeBlock(ast) && !isIgnored(ast)) {
-            final Scope customScope = ScopeUtil.getScope(ast);
-            final Scope surroundingScope = ScopeUtil.getSurroundingScope(ast);
-            result = customScope.isIn(scope) && surroundingScope.isIn(scope)
-                && (excludeScope == null
-                    || !customScope.isIn(excludeScope)
-                    || !surroundingScope.isIn(excludeScope));
+            try {
+                final AccessModifierOption accessModifier =
+                    CheckUtil.getAccessModifierFromModifiersToken(ast);
+                result = matchAccessModifiers(accessModifier);
+            }
+            catch (IllegalArgumentException ex) {
+                result = false;
+            }
         }
         return result;
     }
-
 }
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocVariableCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocVariableCheck.xml
index 32a9ff77988..0322aac524e 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocVariableCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/javadoc/JavadocVariableCheck.xml
@@ -8,18 +8,15 @@
  Checks that a variable has a Javadoc comment. Ignores {@code serialVersionUID} fields.
  &lt;/div&gt;</description>
          <properties>
-            <property name="excludeScope" type="com.puppycrawl.tools.checkstyle.api.Scope">
-               <description>Specify the visibility scope where Javadoc
- comments are not checked.</description>
+            <property default-value="public, protected, package, private"
+                      name="accessModifiers"
+                      type="com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption[]">
+               <description>Access modifiers of methods where parameters are
+ checked.</description>
             </property>
             <property name="ignoreNamePattern" type="java.util.regex.Pattern">
                <description>Specify the regexp to define variable names to ignore.</description>
             </property>
-            <property default-value="private"
-                      name="scope"
-                      type="com.puppycrawl.tools.checkstyle.api.Scope">
-               <description>Specify the visibility scope where Javadoc comments are checked.</description>
-            </property>
             <property default-value="ENUM_CONSTANT_DEF"
                       name="tokens"
                       type="java.lang.String[]"
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckTest.java
index 7ce4a492260..dc4e2e1bfe0 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckTest.java
@@ -26,6 +26,8 @@
 
 import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+import com.puppycrawl.tools.checkstyle.checks.naming.AccessModifierOption;
+import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtil;
 
 public class JavadocVariableCheckTest
@@ -67,10 +69,8 @@ public void testGetAcceptableTokens() {
     public void testDefault()
             throws Exception {
         final String[] expected = {
-            "18:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "311:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "318:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "337:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "16:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "335:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
         verifyWithInlineConfigParser(
                 getPath("InputJavadocVariableTags.java"), expected);
@@ -80,9 +80,9 @@ public void testDefault()
     public void testAnother()
             throws Exception {
         final String[] expected = {
-            "23:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "30:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "36:13: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "21:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "28:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "34:13: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
         verifyWithInlineConfigParser(
                 getPath("InputJavadocVariableInner.java"), expected);
@@ -100,13 +100,13 @@ public void testAnother2()
     public void testAnother3()
             throws Exception {
         final String[] expected = {
-            "17:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "22:13: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "42:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "15:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "20:13: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "40:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "47:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "48:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "49:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "50:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "51:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "52:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
         verifyWithInlineConfigParser(
                 getPath("InputJavadocVariablePublicOnly.java"), expected);
@@ -116,7 +116,8 @@ public void testAnother3()
     public void testAnother4()
             throws Exception {
         final String[] expected = {
-            "52:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "15:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "50:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
         verifyWithInlineConfigParser(
                 getPath("InputJavadocVariablePublicOnly2.java"), expected);
@@ -125,22 +126,22 @@ public void testAnother4()
     @Test
     public void testJavadocVariableOnInnerClassFields() throws Exception {
         final String[] expected = {
+            "14:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "15:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "16:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "17:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "18:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "25:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "26:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "27:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "28:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "29:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "37:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "38:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "39:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "40:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "41:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "49:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "50:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "51:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "52:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "53:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
         verifyWithInlineConfigParser(
                 getPath("InputJavadocVariableOnInnerClassFields.java"),
@@ -150,27 +151,27 @@ public void testJavadocVariableOnInnerClassFields() throws Exception {
     @Test
     public void testJavadocVariableOnPublicInnerClassFields() throws Exception {
         final String[] expected = {
+            "12:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "13:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "14:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "15:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "16:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "17:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "23:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "24:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "25:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "26:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "27:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "28:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "35:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "36:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "37:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "38:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "39:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "40:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "47:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "48:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "49:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "50:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "51:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "52:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "59:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "60:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "61:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "62:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "63:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "64:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "74:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "72:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
         verifyWithInlineConfigParser(
                 getPath("InputJavadocVariableOnPublicInnerClassFields.java"),
@@ -178,12 +179,26 @@ public void testJavadocVariableOnPublicInnerClassFields() throws Exception {
     }
 
     @Test
-    public void testScopes2() throws Exception {
+    public void testAccessModifiersPublicProtected() throws Exception {
         final String[] expected = {
-            "15:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "16:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "26:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "27:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "13:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "14:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "24:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "25:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "36:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "37:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "48:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "49:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "61:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "62:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "72:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "73:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "84:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "85:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "96:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "97:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "108:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "109:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
         verifyWithInlineConfigParser(
                 getPath("InputJavadocVariableNoJavadoc2.java"),
@@ -191,41 +206,27 @@ public void testScopes2() throws Exception {
     }
 
     @Test
-    public void testExcludeScope() throws Exception {
+    public void testAccessModifiersPackagePrivate() throws Exception {
         final String[] expected = {
-            "17:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "18:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "28:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "29:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "15:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "16:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "26:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "27:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "38:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "39:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "40:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "41:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "50:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "51:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "52:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "53:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "63:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "64:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "65:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "66:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "74:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "75:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "76:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "77:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "86:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "87:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "88:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "89:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "98:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "99:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "100:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "101:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "110:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "111:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "112:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "113:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "123:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "121:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
         verifyWithInlineConfigParser(
                 getPath("InputJavadocVariableNoJavadoc3.java"),
@@ -236,42 +237,42 @@ public void testExcludeScope() throws Exception {
     public void testIgnoredVariableNames()
             throws Exception {
         final String[] expected = {
+            "13:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "14:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "15:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "16:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "17:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "18:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "24:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "25:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "26:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "27:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "28:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "29:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "36:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "37:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "38:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "39:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "40:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "41:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "48:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "49:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "50:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "51:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "52:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "53:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "61:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "62:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "63:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "64:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "65:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "66:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "72:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "73:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "74:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "75:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "76:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "77:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "84:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "85:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "86:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "87:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "88:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "89:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "96:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "97:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "98:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "99:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "100:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "101:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "108:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "109:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "110:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "111:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "112:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "113:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
         verifyWithInlineConfigParser(
                 getPath("InputJavadocVariableNoJavadoc4.java"),
@@ -282,43 +283,43 @@ public void testIgnoredVariableNames()
     public void testDoNotIgnoreAnythingWhenIgnoreNamePatternIsEmpty()
             throws Exception {
         final String[] expected = {
+            "13:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "14:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "15:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "16:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "17:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "18:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "24:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "25:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "26:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "27:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "28:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "29:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "36:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "37:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "38:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "39:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "40:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "41:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "48:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "49:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "50:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "51:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "52:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "53:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "61:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "62:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "63:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "64:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "65:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "66:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "72:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "73:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "74:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "75:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "76:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "77:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "84:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "85:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "86:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "87:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "88:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "89:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "96:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "97:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "98:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "99:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "100:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "101:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "108:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "109:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "110:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "111:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "112:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "113:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "123:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "121:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
         verifyWithInlineConfigParser(
                 getPath("InputJavadocVariableNoJavadoc5.java"),
@@ -328,7 +329,7 @@ public void testDoNotIgnoreAnythingWhenIgnoreNamePatternIsEmpty()
     @Test
     public void testLambdaLocalVariablesDoNotNeedJavadoc() throws Exception {
         final String[] expected = {
-            "16:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "15:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
         verifyWithInlineConfigParser(
                 getPath("InputJavadocVariableNoJavadocNeededInLambda.java"),
@@ -338,13 +339,34 @@ public void testLambdaLocalVariablesDoNotNeedJavadoc() throws Exception {
     @Test
     public void testInterfaceMemberScopeIsPublic() throws Exception {
         final String[] expected = {
+            "16:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
             "18:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "20:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "27:9: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
         verifyWithInlineConfigParser(
                 getPath("InputJavadocVariableInterfaceMemberScopeIsPublic.java"),
                 expected);
     }
 
+    /**
+     * Test that when given an array, it creates its own instance of
+     * the array and is not re-using and possible overwriting the given one.
+     * Without this, pitest creates a new mutation on {@code Arrays.copyOf}.
+     *
+     * @throws Exception if an error occurs.
+     */
+    @Test
+    public void testCloneInAccessModifiersProperty() throws Exception {
+        final AccessModifierOption[] input = {
+            AccessModifierOption.PACKAGE,
+            AccessModifierOption.PRIVATE,
+        };
+        final JavadocVariableCheck check = new JavadocVariableCheck();
+        check.setAccessModifiers(input);
+
+        assertWithMessage("check creates its own instance of access modifier array")
+            .that(System.identityHashCode(
+                TestUtil.getClassDeclaredField(JavadocVariableCheck.class, "accessModifiers")
+                    .get(check)))
+            .isNotEqualTo(System.identityHashCode(input));
+    }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInner.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInner.java
index 482c15e1bfb..e2a67726165 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInner.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInner.java
@@ -1,11 +1,9 @@
 /*
 JavadocVariable
-scope = (default)private
-excludeScope = (default)null
+accessModifiers = (default)private
 ignoreNamePattern = (default)null
 tokens = (default)ENUM_CONSTANT_DEF
 
-
 */
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
@@ -20,20 +18,20 @@ class InputJavadocVariableInner
     class InnerInner2
     {
         // Ignore
-        public int fData; // violation
+        public int fData; // violation, 'Missing a Javadoc comment'
     }
 
     // Ignore - 2 violations
     interface InnerInterface2
     {
         // Ignore - should be all upper case
-        String data = "zxzc"; // violation
+        String data = "zxzc"; // violation, 'Missing a Javadoc comment'
 
         // Ignore
         class InnerInterfaceInnerClass
         {
             // Ignore - need Javadoc and made private
-            public int rData; // violation
+            public int rData; // violation, 'Missing a Javadoc comment'
 
             /** needs to be made private unless allowProtected. */
             protected int protectedVariable;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInner2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInner2.java
index 4a3f55bfc20..b89b787f2b9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInner2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInner2.java
@@ -1,11 +1,9 @@
 /*
 JavadocVariable
-scope = public
-excludeScope = (default)null
+accessModifiers = public
 ignoreNamePattern = (default)null
 tokens = (default)ENUM_CONSTANT_DEF
 
-
 */
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
@@ -16,24 +14,22 @@
  */
 class InputJavadocVariableInner2
 {
-    // Ignore - two violations
     class InnerInner2
     {
-        // Ignore
-        public int fData;
+        int fData;
     }
 
     // Ignore - 2 violations
     interface InnerInterface2
     {
-        // Ignore - should be all upper case
+
+        /** Ignore - 1 violation */
         String data = "zxzc";
 
         // Ignore
         class InnerInterfaceInnerClass
         {
-            // Ignore - need Javadoc and made private
-            public int rData;
+            private int rData;
 
             /** needs to be made private unless allowProtected. */
             protected int protectedVariable;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInterfaceMemberScopeIsPublic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInterfaceMemberScopeIsPublic.java
index 190b8afe014..49eaa750b29 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInterfaceMemberScopeIsPublic.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableInterfaceMemberScopeIsPublic.java
@@ -1,11 +1,9 @@
 /*
 JavadocVariable
-scope = public
-excludeScope = (default)null
+accessModifiers = public
 ignoreNamePattern = (default)null
 tokens = ENUM_CONSTANT_DEF, VARIABLE_DEF
 
-
 */
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
@@ -15,16 +13,16 @@ public interface InputJavadocVariableInterfaceMemberScopeIsPublic {
     /** First field */
     public static int field1 = 0;
 
-    public static int field2 = 0; // violation
+    public static int field2 = 0; // violation, 'Missing a Javadoc comment'
 
-    int field3 = 0; // violation
+    int field3 = 0; // violation, 'Missing a Javadoc comment'
 
     enum Enum {
 
         /** First constant */
         A,
 
-        B; // violation
+        B;
 
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc2.java
index 1bf8a5c21da..c2cabab35d8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc2.java
@@ -1,19 +1,17 @@
 /*
 JavadocVariable
-scope = protected
-excludeScope = (default)null
+accessModifiers = public, protected
 ignoreNamePattern = (default)null
 tokens = (default)ENUM_CONSTANT_DEF
 
-
 */
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
 
 public class InputJavadocVariableNoJavadoc2 //comment test
 {
-    public int i1; // violation
-    protected int i2; // violation
+    public int i1; // violation, 'Missing a Javadoc comment'
+    protected int i2; // violation, 'Missing a Javadoc comment'
     int i3;
     private int i4;
 
@@ -23,8 +21,8 @@ void foo3() {}
     private void foo4() {}
 
     protected class ProtectedInner {
-        public int i1; // violation
-        protected int i2; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
         int i3;
         private int i4;
 
@@ -35,8 +33,8 @@ private void foo4() {}
     }
 
     class PackageInner {
-        public int i1;
-        protected int i2;
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
         int i3;
         private int i4;
 
@@ -47,8 +45,8 @@ private void foo4() {}
     }
 
     private class PrivateInner {
-        public int i1;
-        protected int i2;
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
         int i3;
         private int i4;
 
@@ -60,8 +58,8 @@ private void foo4() {}
 }
 
 class  PackageClass2 {
-    public int i1;
-    protected int i2;
+    public int i1; // violation, 'Missing a Javadoc comment'
+    protected int i2; // violation, 'Missing a Javadoc comment'
     int i3;
     private int i4;
 
@@ -71,8 +69,8 @@ void foo3() {}
     private void foo4() {}
 
     public class PublicInner {
-        public int i1;
-        protected int i2;
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
         int i3;
         private int i4;
 
@@ -83,8 +81,8 @@ private void foo4() {}
     }
 
     protected class ProtectedInner {
-        public int i1;
-        protected int i2;
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
         int i3;
         private int i4;
 
@@ -95,8 +93,8 @@ private void foo4() {}
     }
 
     class PackageInner {
-        public int i1;
-        protected int i2;
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
         int i3;
         private int i4;
 
@@ -107,8 +105,8 @@ private void foo4() {}
     }
 
     private class PrivateInner {
-        public int i1;
-        protected int i2;
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
         int i3;
         private int i4;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc3.java
index 36ee9759a1f..32d15c9e370 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc3.java
@@ -1,11 +1,9 @@
 /*
 JavadocVariable
-scope = (default)private
-excludeScope = protected
+accessModifiers = package, private
 ignoreNamePattern = (default)null
 tokens = (default)ENUM_CONSTANT_DEF
 
-
 */
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
@@ -14,8 +12,8 @@ public class InputJavadocVariableNoJavadoc3 //comment test
 {
     public int i1;
     protected int i2;
-    int i3; // violation
-    private int i4; // violation
+    int i3; // violation, 'Missing a Javadoc comment'
+    private int i4;// violation, 'Missing a Javadoc comment'
 
     public void foo1() {}
     protected void foo2() {}
@@ -25,8 +23,8 @@ private void foo4() {}
     protected class ProtectedInner {
         public int i1;
         protected int i2;
-        int i3; // violation
-        private int i4; // violation
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4;// violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -35,10 +33,10 @@ private void foo4() {}
     }
 
     class PackageInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1;
+        protected int i2;
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -47,10 +45,10 @@ private void foo4() {}
     }
 
     private class PrivateInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1;
+        protected int i2;
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -60,10 +58,10 @@ private void foo4() {}
 }
 
 class PackageClass3 {
-    public int i1; // violation
-    protected int i2; // violation
-    int i3; // violation
-    private int i4; // violation
+    public int i1;
+    protected int i2;
+    int i3; // violation, 'Missing a Javadoc comment'
+    private int i4; // violation, 'Missing a Javadoc comment'
 
     public void foo1() {}
     protected void foo2() {}
@@ -71,10 +69,10 @@ void foo3() {}
     private void foo4() {}
 
     public class PublicInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1;
+        protected int i2;
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -83,10 +81,10 @@ private void foo4() {}
     }
 
     protected class ProtectedInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1;
+        protected int i2;
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -95,10 +93,10 @@ private void foo4() {}
     }
 
     class PackageInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1;
+        protected int i2;
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -107,10 +105,10 @@ private void foo4() {}
     }
 
     private class PrivateInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1;
+        protected int i2;
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc4.java
index c2d60dd66c2..78e83fb6e65 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc4.java
@@ -1,21 +1,19 @@
 /*
 JavadocVariable
-scope = (default)private
-excludeScope = (default)null
+accessModifiers = (default)private
 ignoreNamePattern = log|logger
 tokens = (default)ENUM_CONSTANT_DEF
 
-
 */
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
 
 public class InputJavadocVariableNoJavadoc4 //comment test
 {
-    public int i1; // violation
-    protected int i2; // violation
-    int i3; // violation
-    private int i4; // violation
+    public int i1; // violation, 'Missing a Javadoc comment'
+    protected int i2; // violation, 'Missing a Javadoc comment'
+    int i3; // violation, 'Missing a Javadoc comment'
+    private int i4; // violation, 'Missing a Javadoc comment'
 
     public void foo1() {}
     protected void foo2() {}
@@ -23,10 +21,10 @@ void foo3() {}
     private void foo4() {}
 
     protected class ProtectedInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -35,10 +33,10 @@ private void foo4() {}
     }
 
     class PackageInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -47,10 +45,10 @@ private void foo4() {}
     }
 
     private class PrivateInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -60,10 +58,10 @@ private void foo4() {}
 }
 
 class PackageClass4 {
-    public int i1; // violation
-    protected int i2; // violation
-    int i3; // violation
-    private int i4; // violation
+    public int i1; // violation, 'Missing a Javadoc comment'
+    protected int i2; // violation, 'Missing a Javadoc comment'
+    int i3; // violation, 'Missing a Javadoc comment'
+    private int i4; // violation, 'Missing a Javadoc comment'
 
     public void foo1() {}
     protected void foo2() {}
@@ -71,10 +69,10 @@ void foo3() {}
     private void foo4() {}
 
     public class PublicInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -83,10 +81,10 @@ private void foo4() {}
     }
 
     protected class ProtectedInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -95,10 +93,10 @@ private void foo4() {}
     }
 
     class PackageInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -107,10 +105,10 @@ private void foo4() {}
     }
 
     private class PrivateInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc5.java
index b87bd6553a1..d829ba014ed 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadoc5.java
@@ -1,21 +1,19 @@
 /*
 JavadocVariable
-scope = (default)private
-excludeScope = (default)null
+accessModifiers = (default)private
 ignoreNamePattern =
 tokens = (default)ENUM_CONSTANT_DEF
 
-
 */
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
 
 public class InputJavadocVariableNoJavadoc5 //comment test
 {
-    public int i1; // violation
-    protected int i2; // violation
-    int i3; // violation
-    private int i4; // violation
+    public int i1; // violation, 'Missing a Javadoc comment'
+    protected int i2; // violation, 'Missing a Javadoc comment'
+    int i3; // violation, 'Missing a Javadoc comment'
+    private int i4; // violation, 'Missing a Javadoc comment'
 
     public void foo1() {}
     protected void foo2() {}
@@ -23,10 +21,10 @@ void foo3() {}
     private void foo4() {}
 
     protected class ProtectedInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -35,10 +33,10 @@ private void foo4() {}
     }
 
     class PackageInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -47,10 +45,10 @@ private void foo4() {}
     }
 
     private class PrivateInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -60,10 +58,10 @@ private void foo4() {}
 }
 
 class PackageClass5 {
-    public int i1; // violation
-    protected int i2; // violation
-    int i3; // violation
-    private int i4; // violation
+    public int i1; // violation, 'Missing a Javadoc comment'
+    protected int i2; // violation, 'Missing a Javadoc comment'
+    int i3; // violation, 'Missing a Javadoc comment'
+    private int i4; // violation, 'Missing a Javadoc comment'
 
     public void foo1() {}
     protected void foo2() {}
@@ -71,10 +69,10 @@ void foo3() {}
     private void foo4() {}
 
     public class PublicInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -83,10 +81,10 @@ private void foo4() {}
     }
 
     protected class ProtectedInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -95,10 +93,10 @@ private void foo4() {}
     }
 
     class PackageInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -107,10 +105,10 @@ private void foo4() {}
     }
 
     private class PrivateInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -120,7 +118,7 @@ private void foo4() {}
 
     class IgnoredName {
         // ignore by name
-        private int logger; // violation
+        private int logger; // violation, 'Missing a Javadoc comment'
         // no warning, 'serialVersionUID' fields do not require Javadoc
         private static final long serialVersionUID = 0;
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadocNeededInLambda.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadocNeededInLambda.java
index 75a834c7d19..e7460f0cc9c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadocNeededInLambda.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableNoJavadocNeededInLambda.java
@@ -1,11 +1,9 @@
 /*
 JavadocVariable
-scope = (default)private
-excludeScope = (default)null
+accessModifiers = (default)private
 ignoreNamePattern = (default)null
 tokens = (default)ENUM_CONSTANT_DEF
 
-
 */
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
@@ -13,7 +11,8 @@
 import java.util.function.Function;
 
 public class InputJavadocVariableNoJavadocNeededInLambda {
-    private static final Function<String, String> FUNCTION1 = (String it) -> { // violation
+    // violation below, 'Missing a Javadoc comment'
+    private static final Function<String, String> FUNCTION1 = (String it) -> {
         String stuff = it;
         return stuff + it;
     };
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableOnInnerClassFields.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableOnInnerClassFields.java
index 4e4f65fc8b5..d57cdb1792f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableOnInnerClassFields.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableOnInnerClassFields.java
@@ -1,21 +1,20 @@
 /*
 JavadocVariable
-scope = (default)private
+accessModifiers = (default)private
 excludeScope = (default)null
 ignoreNamePattern = (default)null
 tokens = (default)ENUM_CONSTANT_DEF
 
-
 */
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
 
 public class InputJavadocVariableOnInnerClassFields //comment test
 {
-    public int i1; // violation
-    protected int i2; // violation
-    int i3; // violation
-    private int i4; // violation
+    public int i1; // violation, 'Missing a Javadoc comment'
+    protected int i2; // violation, 'Missing a Javadoc comment'
+    int i3; // violation, 'Missing a Javadoc comment'
+    private int i4; // violation, 'Missing a Javadoc comment'
 
     public void foo1() {}
     protected void foo2() {}
@@ -23,10 +22,10 @@ void foo3() {}
     private void foo4() {}
 
     protected class ProtectedInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -35,10 +34,10 @@ private void foo4() {}
     }
 
     class PackageInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -47,10 +46,10 @@ private void foo4() {}
     }
 
     private class PrivateInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableOnPublicInnerClassFields.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableOnPublicInnerClassFields.java
index 2b06ae2137d..fd5d5d59bc2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableOnPublicInnerClassFields.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableOnPublicInnerClassFields.java
@@ -1,20 +1,18 @@
 /*
 JavadocVariable
-scope = (default)private
-excludeScope = (default)null
+accessModifiers = (default)private
 ignoreNamePattern = (default)null
 tokens = (default)ENUM_CONSTANT_DEF
 
-
 */
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
 
 public class InputJavadocVariableOnPublicInnerClassFields {
-    public int i1; // violation
-    protected int i2; // violation
-    int i3; // violation
-    private int i4; // violation
+    public int i1; // violation, 'Missing a Javadoc comment'
+    protected int i2; // violation, 'Missing a Javadoc comment'
+    int i3; // violation, 'Missing a Javadoc comment'
+    private int i4; // violation, 'Missing a Javadoc comment'
 
     public void foo1() {}
     protected void foo2() {}
@@ -22,10 +20,10 @@ void foo3() {}
     private void foo4() {}
 
     public class PublicInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -34,10 +32,10 @@ private void foo4() {}
     }
 
     protected class ProtectedInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -46,10 +44,10 @@ private void foo4() {}
     }
 
     class PackageInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -58,10 +56,10 @@ private void foo4() {}
     }
 
     private class PrivateInner {
-        public int i1; // violation
-        protected int i2; // violation
-        int i3; // violation
-        private int i4; // violation
+        public int i1; // violation, 'Missing a Javadoc comment'
+        protected int i2; // violation, 'Missing a Javadoc comment'
+        int i3; // violation, 'Missing a Javadoc comment'
+        private int i4; // violation, 'Missing a Javadoc comment'
 
         public void foo1() {}
         protected void foo2() {}
@@ -71,7 +69,7 @@ private void foo4() {}
 
     class IgnoredName {
 
-        private int logger; // violation
+        private int logger; // violation, 'Missing a Javadoc comment'
         // no warning, 'serialVersionUID' fields do not require Javadoc
         private static final long serialVersionUID = 0;
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariablePublicOnly.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariablePublicOnly.java
index 43f15016517..020bdb0871f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariablePublicOnly.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariablePublicOnly.java
@@ -1,11 +1,9 @@
 /*
 JavadocVariable
-scope = (default)private
-excludeScope = (default)null
+accessModifiers = (default)private
 ignoreNamePattern = (default)null
 tokens = (default)ENUM_CONSTANT_DEF
 
-
 */
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
@@ -14,12 +12,12 @@ public class InputJavadocVariablePublicOnly // ignore - need javadoc
 {
     private interface InnerInterface // ignore - when not relaxed about Javadoc
     {
-        String CONST = "InnerInterface"; // violation
+        String CONST = "InnerInterface"; // violation, 'Missing a Javadoc comment'
         void method(); // ignore - when not relaxed about Javadoc
 
         class InnerInnerClass // ignore - when not relaxed about Javadoc
         {
-            private int mData; // violation
+            private int mData; // violation, 'Missing a Javadoc comment'
 
             private InnerInnerClass()
             {
@@ -39,17 +37,17 @@ void method2() // ignore - when not relaxed about Javadoc
 
     private class InnerClass // ignore
     {
-        private int mDiff; // violation
+        private int mDiff; // violation, 'Missing a Javadoc comment'
 
         void method() // ignore - when not relaxed about Javadoc
         {
         }
     }
 
-    private int mSize; // violation
-    int mLen; // violation
-    protected int mDeer; // violation
-    public int aFreddo; // violation
+    private int mSize; // violation, 'Missing a Javadoc comment'
+    int mLen; // violation, 'Missing a Javadoc comment'
+    protected int mDeer; // violation, 'Missing a Javadoc comment'
+    public int aFreddo; // violation, 'Missing a Javadoc comment'
 
     // ignore - need Javadoc
     private InputJavadocVariablePublicOnly(int aA)
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariablePublicOnly2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariablePublicOnly2.java
index 1e2876e035b..1085924a803 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariablePublicOnly2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariablePublicOnly2.java
@@ -1,11 +1,9 @@
 /*
 JavadocVariable
-scope = public
-excludeScope = (default)null
+accessModifiers = public
 ignoreNamePattern = (default)null
 tokens = (default)ENUM_CONSTANT_DEF
 
-
 */
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
@@ -14,7 +12,7 @@ public class InputJavadocVariablePublicOnly2 // ignore - need javadoc
 {
     private interface InnerInterface // ignore - when not relaxed about Javadoc
     {
-        String CONST = "InnerInterface"; // ignore - w.n.r.a.j
+        String CONST = "InnerInterface"; // violation, 'Missing a Javadoc comment'
         void method(); // ignore - when not relaxed about Javadoc
 
         class InnerInnerClass // ignore - when not relaxed about Javadoc
@@ -49,7 +47,7 @@ void method() // ignore - when not relaxed about Javadoc
     private int mSize; // ignore - when not relaxed about Javadoc
     int mLen; // ignore - when not relaxed about Javadoc
     protected int mDeer; // ignore
-    public int aFreddo; // violation
+    public int aFreddo; // violation, 'Missing a Javadoc comment'
 
     // ignore - need Javadoc
     private InputJavadocVariablePublicOnly2(int aA)
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableTags.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableTags.java
index beccae83a79..a808eccfc5f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableTags.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/InputJavadocVariableTags.java
@@ -1,11 +1,9 @@
 /*
 JavadocVariable
-scope = (default)private
-excludeScope = (default)null
+accessModifiers = (default)private
 ignoreNamePattern = (default)null
 tokens = (default)ENUM_CONSTANT_DEF
 
-
 */
 
 package com.puppycrawl.tools.checkstyle.checks.javadoc.javadocvariable;
@@ -15,7 +13,7 @@
 class InputJavadocVariableTags1
 {
     // Invalid - should be Javadoc
-    private int mMissingJavadoc; // violation
+    private int mMissingJavadoc; // violation, 'Missing a Javadoc comment'
 
     // Invalid - should be Javadoc
     void method1()
@@ -308,14 +306,14 @@ public int foo(Object _arg) {
 
 enum InputJavadocVariableTagsEnum
 {
-    CONSTANT_A, // violation
+    CONSTANT_A,
 
     /**
      *
      */
     CONSTANT_B,
 
-    CONSTANT_C // violation
+    CONSTANT_C
     {
         /**
          *
@@ -334,7 +332,7 @@ public void someOtherMethod()
 @interface InputJavadocVariableTagsAnnotation
 {
     String someField();
-    int A_CONSTANT = 0; // violation
+    int A_CONSTANT = 0; // violation, 'Missing a Javadoc comment'
     /** Some javadoc. */
     int B_CONSTANT = 1;
     /** @return This tag is valid here and expected with Java 8 */
diff --git a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckExamplesTest.java b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckExamplesTest.java
index e4e6e9f7415..ded43322ba0 100644
--- a/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckExamplesTest.java
+++ b/src/xdocs-examples/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheckExamplesTest.java
@@ -54,8 +54,8 @@ public void testExample2() throws Exception {
     @Test
     public void testExample3() throws Exception {
         final String[] expected = {
-            "15:3: " + getCheckMessage(MSG_JAVADOC_MISSING),
-            "23:15: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "14:3: " + getCheckMessage(MSG_JAVADOC_MISSING),
+            "22:15: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
 
         verifyWithInlineConfigParser(getPath("Example3.java"), expected);
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example2.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example2.java
index e19d834316f..f9b0cbb4597 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example2.java
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example2.java
@@ -2,7 +2,7 @@
 <module name="Checker">
   <module name="TreeWalker">
     <module name="JavadocVariable">
-      <property name="scope" value="public"/>
+      <property name="accessModifiers" value="public"/>
     </module>
   </module>
 </module>
diff --git a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example3.java b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example3.java
index dad03f68d39..d1eacc469a4 100644
--- a/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example3.java
+++ b/src/xdocs-examples/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/javadocvariable/Example3.java
@@ -2,8 +2,7 @@
 <module name="Checker">
   <module name="TreeWalker">
     <module name="JavadocVariable">
-      <property name="scope" value="private"/>
-      <property name="excludeScope" value="protected"/>
+      <property name="accessModifiers" value="private,package"/>
     </module>
   </module>
 </module>
diff --git a/src/xdocs/checks/javadoc/javadocvariable.xml b/src/xdocs/checks/javadoc/javadocvariable.xml
index 4a4c9e1bbe8..8f8b82d452b 100644
--- a/src/xdocs/checks/javadoc/javadocvariable.xml
+++ b/src/xdocs/checks/javadoc/javadocvariable.xml
@@ -26,11 +26,11 @@
               <th>since</th>
             </tr>
             <tr>
-              <td>excludeScope</td>
-              <td>Specify the visibility scope where Javadoc comments are not checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>null</code></td>
-              <td>3.4</td>
+              <td>accessModifiers</td>
+              <td>Access modifiers of methods where parameters are checked.</td>
+              <td><a href="../../property_types.html#AccessModifierOption.5B.5D">AccessModifierOption[]</a></td>
+              <td><code>public, protected, package, private</code></td>
+              <td>11.0.0</td>
             </tr>
             <tr>
               <td>ignoreNamePattern</td>
@@ -39,13 +39,6 @@
               <td><code>null</code></td>
               <td>5.8</td>
             </tr>
-            <tr>
-              <td>scope</td>
-              <td>Specify the visibility scope where Javadoc comments are checked.</td>
-              <td><a href="../../property_types.html#Scope">Scope</a></td>
-              <td><code>private</code></td>
-              <td>3.0</td>
-            </tr>
             <tr>
               <td>tokens</td>
               <td>tokens to check</td>
@@ -78,7 +71,7 @@
         </source>
         <p id="Example1-code">
           By default, this setting will report a violation if
-          there is no javadoc for any scope member.
+          there is no javadoc for a member with any access modifier.
         </p>
         <source>
 public class Example1 {
@@ -96,15 +89,15 @@ public class Example1 {
         </source>
 
         <p id="Example2-config">
-          To configure the check for <code>public</code>
-          scope:
+          To configure the check <code>public</code>
+          access modifier:
         </p>
 
         <source>
 &lt;module name=&quot;Checker&quot;&gt;
   &lt;module name=&quot;TreeWalker&quot;&gt;
     &lt;module name=&quot;JavadocVariable&quot;&gt;
-      &lt;property name=&quot;scope&quot; value=&quot;public&quot;/&gt;
+      &lt;property name=&quot;accessModifiers&quot; value=&quot;public&quot;/&gt;
     &lt;/module&gt;
   &lt;/module&gt;
 &lt;/module&gt;
@@ -128,24 +121,22 @@ public class Example2 {
         </source>
 
         <p id="Example3-config">
-          To configure the check for members which are in <code>private</code>, but not in
-          <code>protected</code> scope:
+          To configure the check for members which are in <code>private</code> or
+          <code>package</code> access modifier:
         </p>
 
         <source>
 &lt;module name=&quot;Checker&quot;&gt;
   &lt;module name=&quot;TreeWalker&quot;&gt;
     &lt;module name=&quot;JavadocVariable&quot;&gt;
-      &lt;property name=&quot;scope&quot; value=&quot;private&quot;/&gt;
-      &lt;property name=&quot;excludeScope&quot; value=&quot;protected&quot;/&gt;
+      &lt;property name=&quot;accessModifiers&quot; value=&quot;private,package&quot;/&gt;
     &lt;/module&gt;
   &lt;/module&gt;
 &lt;/module&gt;
         </source>
         <p id="Example3-code">
           This setting will report a violation if there is no
-          javadoc for <code>private</code> member and
-          ignores <code>protected</code> member.
+          javadoc for <code>private</code>  or <code>package</code> member.
         </p>
         <source>
 public class Example3 {
diff --git a/src/xdocs/checks/javadoc/javadocvariable.xml.template b/src/xdocs/checks/javadoc/javadocvariable.xml.template
index 70d036d7138..5bfc7a239a2 100644
--- a/src/xdocs/checks/javadoc/javadocvariable.xml.template
+++ b/src/xdocs/checks/javadoc/javadocvariable.xml.template
@@ -35,7 +35,7 @@
         </macro>
         <p id="Example1-code">
           By default, this setting will report a violation if
-          there is no javadoc for any scope member.
+          there is no javadoc for a member with any access modifier.
         </p>
         <macro name="example">
           <param name="path"
@@ -44,8 +44,8 @@
         </macro>
 
         <p id="Example2-config">
-          To configure the check for <code>public</code>
-          scope:
+          To configure the check <code>public</code>
+          access modifier:
         </p>
 
         <macro name="example">
@@ -64,8 +64,8 @@
         </macro>
 
         <p id="Example3-config">
-          To configure the check for members which are in <code>private</code>, but not in
-          <code>protected</code> scope:
+          To configure the check for members which are in <code>private</code> or
+          <code>package</code> access modifier:
         </p>
 
         <macro name="example">
@@ -75,8 +75,7 @@
         </macro>
         <p id="Example3-code">
           This setting will report a violation if there is no
-          javadoc for <code>private</code> member and
-          ignores <code>protected</code> member.
+          javadoc for <code>private</code>  or <code>package</code> member.
         </p>
         <macro name="example">
           <param name="path"