diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/AllTests.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/AllTests.java
index cca08fabd..9814fdd22 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/checks/AllTests.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/AllTests.java
@@ -19,7 +19,6 @@ public class AllTests {
         suite.addTest(new TestSuite(FileSetCheckLifecycleTest.class));
         suite.addTest(new TestSuite(FinalParametersCheckTest.class));
         suite.addTest(new TestSuite(GenericIllegalRegexpCheckTest.class));
-        suite.addTest(new TestSuite(HeaderCheckTest.class));
         suite.addTest(new TestSuite(ModifierOrderCheckTest.class));
         suite.addTest(new TestSuite(NewlineAtEndOfFileCheckTest.class));
         suite.addTest(new TestSuite(RedundantModifierTest.class));
@@ -34,6 +33,7 @@ public class AllTests {
         suite.addTest(com.puppycrawl.tools.checkstyle.checks.blocks.AllTests.suite());
         suite.addTest(com.puppycrawl.tools.checkstyle.checks.coding.AllTests.suite());
         suite.addTest(com.puppycrawl.tools.checkstyle.checks.design.AllTests.suite());
+        suite.addTest(com.puppycrawl.tools.checkstyle.checks.header.AllTests.suite());
         suite.addTest(com.puppycrawl.tools.checkstyle.checks.imports.AllTests.suite());
         suite.addTest(com.puppycrawl.tools.checkstyle.checks.indentation.AllTests.suite());
         suite.addTest(com.puppycrawl.tools.checkstyle.checks.j2ee.AllTests.suite());
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/header/AllTests.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/header/AllTests.java
new file mode 100644
index 000000000..90ece23ea
--- /dev/null
+++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/header/AllTests.java
@@ -0,0 +1,21 @@
+package com.puppycrawl.tools.checkstyle.checks.header;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(AllTests.class);
+    }
+
+    public static Test suite() {
+        TestSuite suite =
+            new TestSuite("Test for com.puppycrawl.tools.checkstyle.checks.header");
+
+        // tests from this package
+        suite.addTest(new TestSuite(HeaderCheckTest.class));
+
+        return suite;
+    }
+}
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/HeaderCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckTest.java
similarity index 97%
rename from src/tests/com/puppycrawl/tools/checkstyle/checks/HeaderCheckTest.java
rename to src/tests/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckTest.java
index 942132ae7..2f6852792 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/checks/HeaderCheckTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckTest.java
@@ -1,9 +1,7 @@
-package com.puppycrawl.tools.checkstyle.checks;
+package com.puppycrawl.tools.checkstyle.checks.header;
 
 import com.puppycrawl.tools.checkstyle.BaseCheckTestCase;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
-import com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck;
-import com.puppycrawl.tools.checkstyle.checks.header.RegexpHeaderCheck;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
 
 public class HeaderCheckTest extends BaseCheckTestCase