diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckTest.java
index 665dc16f5f2d..798c1009a50e 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckTest.java
@@ -61,14 +61,10 @@ protected String getPath(String filename) throws IOException {
                 + filename);
     }
 
-    private String getConfigPath(String filename) throws IOException {
-        return super.getPath("configs" + File.separator + filename);
-    }
-
     @Test
     public void testStaticHeader() throws Exception {
         final DefaultConfiguration checkConfig = createCheckConfig(HeaderCheck.class);
-        checkConfig.addAttribute("headerFile", getConfigPath("java.header"));
+        checkConfig.addAttribute("headerFile", getPath("inputheaderjava.header"));
         checkConfig.addAttribute("ignoreLines", "");
         final String[] expected = {
             "1: " + getCheckMessage(MSG_MISSING),
@@ -82,7 +78,7 @@ public void testNoHeader() throws Exception {
         try {
             createChecker(checkConfig);
             final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
-            verify(checkConfig, getPath("InputRegexpHeader.java"), expected);
+            verify(checkConfig, getPath("InputHeaderRegexp.java"), expected);
         }
         catch (CheckstyleException ex) {
             // Exception is not expected
@@ -97,7 +93,7 @@ public void testWhitespaceHeader() throws Exception {
         try {
             createChecker(checkConfig);
             final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
-            verify(checkConfig, getPath("InputRegexpHeader.java"), expected);
+            verify(checkConfig, getPath("InputHeaderRegexp.java"), expected);
         }
         catch (CheckstyleException ex) {
             // Exception is not expected
@@ -129,7 +125,7 @@ public void testNonExistingHeaderFile() throws Exception {
     @Test
     public void testInvalidCharset() throws Exception {
         final DefaultConfiguration checkConfig = createCheckConfig(HeaderCheck.class);
-        checkConfig.addAttribute("headerFile", getConfigPath("java.header"));
+        checkConfig.addAttribute("headerFile", getPath("inputheaderjava.header"));
         checkConfig.addAttribute("charset", "XSO-8859-1");
         try {
             createChecker(checkConfig);
@@ -181,22 +177,22 @@ public void testNullFilename() throws Exception {
     @Test
     public void testNotMatch() throws Exception {
         final DefaultConfiguration checkConfig = createCheckConfig(HeaderCheck.class);
-        checkConfig.addAttribute("headerFile", getConfigPath("java.header"));
+        checkConfig.addAttribute("headerFile", getPath("inputheaderjava.header"));
         checkConfig.addAttribute("ignoreLines", "");
         final String[] expected = {
             "2: " + getCheckMessage(MSG_MISMATCH,
                     "// checkstyle: Checks Java source code for adherence to a set of rules."),
         };
-        verify(checkConfig, getConfigPath("java2.header"), expected);
+        verify(checkConfig, getPath("inputheaderjava2.header"), expected);
     }
 
     @Test
     public void testIgnore() throws Exception {
         final DefaultConfiguration checkConfig = createCheckConfig(HeaderCheck.class);
-        checkConfig.addAttribute("headerFile", getConfigPath("java.header"));
+        checkConfig.addAttribute("headerFile", getPath("inputheaderjava.header"));
         checkConfig.addAttribute("ignoreLines", "2");
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getConfigPath("java2.header"), expected);
+        verify(checkConfig, getPath("inputheaderjava2.header"), expected);
     }
 
     @Test
@@ -235,7 +231,7 @@ public void testIoExceptionWhenLoadingHeaderFile() throws Exception {
         PowerMockito.doThrow(new IOException("expected exception")).when(check, "loadHeader",
                 anyObject());
 
-        check.setHeaderFile(CommonUtils.getUriByFilename(getPath("InputRegexpHeader.java")));
+        check.setHeaderFile(CommonUtils.getUriByFilename(getPath("InputHeaderRegexp.java")));
 
         final Method loadHeaderFile = AbstractHeaderCheck.class.getDeclaredMethod("loadHeaderFile");
         loadHeaderFile.setAccessible(true);
@@ -253,7 +249,7 @@ public void testIoExceptionWhenLoadingHeaderFile() throws Exception {
     @Test
     public void testCacheHeaderFile() throws Exception {
         final DefaultConfiguration checkConfig = createCheckConfig(HeaderCheck.class);
-        checkConfig.addAttribute("headerFile", getConfigPath("java.header"));
+        checkConfig.addAttribute("headerFile", getPath("inputheaderjava.header"));
 
         final DefaultConfiguration checkerConfig = new DefaultConfiguration("checkstyle_checks");
         checkerConfig.addChild(checkConfig);
@@ -298,9 +294,9 @@ public void testCacheHeaderWithoutFile() throws Exception {
     @Test
     public void testIgnoreLinesSorted() throws Exception {
         final DefaultConfiguration checkConfig = createCheckConfig(HeaderCheck.class);
-        checkConfig.addAttribute("headerFile", getConfigPath("java.header"));
+        checkConfig.addAttribute("headerFile", getPath("inputheaderjava.header"));
         checkConfig.addAttribute("ignoreLines", "4,2,3");
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getConfigPath("java3.header"), expected);
+        verify(checkConfig, getPath("inputheaderjava3.header"), expected);
     }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputRegexpHeader.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderRegexp.java
similarity index 77%
rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputRegexpHeader.java
rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderRegexp.java
index 430953bedde1..a680e646135a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputRegexpHeader.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/InputHeaderRegexp.java
@@ -6,6 +6,6 @@
  * Some doc.
  */
 
-public class InputRegexpHeader
+public class InputHeaderRegexp
 {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/configs/java.header b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/inputheaderjava.header
similarity index 100%
rename from src/test/resources/com/puppycrawl/tools/checkstyle/configs/java.header
rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/inputheaderjava.header
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/configs/java2.header b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/inputheaderjava2.header
similarity index 100%
rename from src/test/resources/com/puppycrawl/tools/checkstyle/configs/java2.header
rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/inputheaderjava2.header
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/configs/java3.header b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/inputheaderjava3.header
similarity index 100%
rename from src/test/resources/com/puppycrawl/tools/checkstyle/configs/java3.header
rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/header/header/inputheaderjava3.header