diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java
index de721be18..d5bcd5985 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java
@@ -33,29 +33,29 @@ public class NonEmptyAtclauseDescriptionCheckTest
         final DefaultConfiguration checkConfig =
                 createCheckConfig(NonEmptyAtclauseDescriptionCheck.class);
         final String[] expected = {
-            //this is a case with description that is sequences of spaces
-            "25: At-clause should have a non-empty description.",
             //this is a case with description that is sequences of spaces
             "26: At-clause should have a non-empty description.",
             //this is a case with description that is sequences of spaces
             "27: At-clause should have a non-empty description.",
             //this is a case with description that is sequences of spaces
-            "36: At-clause should have a non-empty description.",
+            "28: At-clause should have a non-empty description.",
             //this is a case with description that is sequences of spaces
             "37: At-clause should have a non-empty description.",
             //this is a case with description that is sequences of spaces
             "38: At-clause should have a non-empty description.",
-            "74: At-clause should have a non-empty description.",
+            //this is a case with description that is sequences of spaces
+            "39: At-clause should have a non-empty description.",
             "75: At-clause should have a non-empty description.",
             "76: At-clause should have a non-empty description.",
             "77: At-clause should have a non-empty description.",
             "78: At-clause should have a non-empty description.",
             "79: At-clause should have a non-empty description.",
-            "88: At-clause should have a non-empty description.",
+            "80: At-clause should have a non-empty description.",
             "89: At-clause should have a non-empty description.",
             "90: At-clause should have a non-empty description.",
             "91: At-clause should have a non-empty description.",
             "92: At-clause should have a non-empty description.",
+            "93: At-clause should have a non-empty description.",
         };
         verify(checkConfig, getPath("javadoc/InputNonEmptyAtclauseDescriptionCheck.java"), expected);
     }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java
index fdd8e2950..5ccbe84bf 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java
@@ -31,8 +31,8 @@ public class SingleLineJavadocCheckTest extends BaseCheckTestSupport
         final DefaultConfiguration checkConfig =
                 createCheckConfig(SingleLineJavadocCheck.class);
         final String[] expected = {
-            "3: Single-line Javadoc comment should be multi-line.",
-            "11: Single-line Javadoc comment should be multi-line.",
+            "4: Single-line Javadoc comment should be multi-line.",
+            "12: Single-line Javadoc comment should be multi-line.",
         };
         verify(checkConfig, getPath("javadoc/InputSingleLineJavadocCheck.java"), expected);
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/GuavaFP.java b/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/GuavaFP.java
index db12227fa..d30564ef8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/GuavaFP.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/GuavaFP.java
@@ -2,7 +2,7 @@ package com.puppycrawl.tools.checkstyle.javadoc;
 
 import com.google.common.base.Function;
 
-class Foo {
+class Foo5 {
 
     /**
      * This class implements the GWT serialization of {@link HashMultimap}.
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputCorrectAtClauseOrderCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputCorrectAtClauseOrderCheck.java
index 95a0563ed..999c082bc 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputCorrectAtClauseOrderCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputCorrectAtClauseOrderCheck.java
@@ -277,7 +277,7 @@ class WithAnnotations implements Serializable
  * @since Some javadoc.
  * @deprecated Some javadoc.
  */
-enum Foo {}
+enum Foo3 {}
 
 /**
  * Some javadoc.
@@ -288,4 +288,4 @@ enum Foo {}
  * @since Some javadoc.
  * @deprecated Some javadoc.
  */
-interface FooIn {}
+interface FooIn3 {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputIncorrectAtClauseOrderCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputIncorrectAtClauseOrderCheck.java
index 0b60a4741..728e28454 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputIncorrectAtClauseOrderCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputIncorrectAtClauseOrderCheck.java
@@ -277,7 +277,7 @@ class WithAnnotations implements Serializable
  * @see Some javadoc. //warn
  * @author max //warn
  */
-enum Foo {}
+enum Foo4 {}
 
 /**
  * Some javadoc.
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputIncorrectJavaDocParagraphCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputIncorrectJavaDocParagraphCheck.java
index b77b3eb33..a9fd08a9f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputIncorrectJavaDocParagraphCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputIncorrectJavaDocParagraphCheck.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.javadoc;
 
-import InputCorrectJavaDocParagraphCheck.InnerInputCorrectJavaDocParagraphCheck;
+
 
 /**
  * Some Javadoc.
@@ -8,7 +8,7 @@ import InputCorrectJavaDocParagraphCheck.InnerInputCorrectJavaDocParagraphCheck;
  * /^ WARN/   Some Javadoc.<p>
  *
  */
-class InputCorrectJavaDocParagraphCheck {
+class InputInCorrectJavaDocParagraphCheck {
 
     /**
      * Some Javadoc.<P>  //WARN
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputIncorrectSummaryJavaDocCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputIncorrectSummaryJavaDocCheck.java
index 8b9a435af..c307598d5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputIncorrectSummaryJavaDocCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputIncorrectSummaryJavaDocCheck.java
@@ -4,7 +4,7 @@ package com.puppycrawl.tools.checkstyle.javadoc;
  * A {@code Foo. Foo}
  * is a simple Javadoc. Some javadoc.
  */
-class InputCorrectJavaDocParagraphCheck {
+class InputInCorrectSummaryJavaDocCheck {
     
     /**
      * As of JDK 1.1, replaced by {@link #setBounds(int,int,int,int)}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputNonEmptyAtclauseDescriptionCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputNonEmptyAtclauseDescriptionCheck.java
index 5caebf798..efb365790 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputNonEmptyAtclauseDescriptionCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputNonEmptyAtclauseDescriptionCheck.java
@@ -1,3 +1,4 @@
+package com.puppycrawl.tools.checkstyle.javadoc;
 class InputNonEmptyAtclauseDescriptionCheck
 {
 	/**
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputSingleLineJavadocCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputSingleLineJavadocCheck.java
index 1dad3145c..aed7928fb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputSingleLineJavadocCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/javadoc/InputSingleLineJavadocCheck.java
@@ -1,7 +1,8 @@
+package com.puppycrawl.tools.checkstyle.javadoc;
 class Foo{
 
 	/** As of JDK 1.1, replaced by {@link #setBounds(int,int,int,int)} */
-    void foo1() {}
+    void foo() {}
 
     /**
      * As of JDK 1.1, replaced by {@link #setBounds(int,int,int,int)}
@@ -9,18 +10,18 @@ class Foo{
     void foo1() {}
 
     /** @throws CheckstyleException if an error occurs */
-    void foo1() {}
+    void foo2() {}
 
     /**
      * @throws CheckstyleException if an error occurs
      */
-    void foo1() {}
+    void foo3() {}
 
     /** An especially short bit of Javadoc. */
-    void foo1() {}
+    void foo4() {}
 
     /**
      * An especially short bit of Javadoc.
      */
-    void foo1() {}
+    void foo5() {}
 }
\ No newline at end of file