Issue #2161: unify test input locations

33 files changed, 41 insertions, 49 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/DOMSource.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/DOMSource.java
index 58edbbf3a..34a42557c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/DOMSource.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/DOMSource.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import javax.xml.transform.Source;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrder.java
index 91dc46b96..7756b0cf5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrder.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import static java.io.File.createTempFile;
 import static java.awt.Button.ABORT;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrder2.java
index a87c97e9e..01cf3d813 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrder2.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import static java.io.File.createTempFile;
 import static java.awt.Button.ABORT; //warn, LEXIC, should be before java.io.File.createTempFile
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderImportsContainingJava.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrderImportsContainingJava.java
index f4f772abf..84def3353 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderImportsContainingJava.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrderImportsContainingJava.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import java.io.File;
 import javax.lang.model.SourceVersion;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderNoValid.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrderNoValid.java
index fb2d135a9..b5a0b8024 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderNoValid.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrderNoValid.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import java.util.Map;
 import java.util.Map.Entry;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderThirdPartyAndSpecial.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrderThirdPartyAndSpecial.java
index 2bc26b1c8..1e75c6026 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderThirdPartyAndSpecial.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrderThirdPartyAndSpecial.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.Beta;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderThirdPartyPackage.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrderThirdPartyPackage.java
index 3ac9b2f17..70f009b80 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrderThirdPartyPackage.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrderThirdPartyPackage.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 
 import org.junit.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder_MultiplePatternMatches.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrder_MultiplePatternMatches.java
index 1002ecece..ac26757ad 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder_MultiplePatternMatches.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrder_MultiplePatternMatches.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import org.junit.Test;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrder_NoImports.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrder_NoImports.java
new file mode 100644
index 000000000..e04a7e674
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrder_NoImports.java
@@ -0,0 +1,5 @@
+package com.puppycrawl.tools.checkstyle.checks.imports;
+
+
+public class InputCustomImportOrder_NoImports {
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder_NoSeparator.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrder_NoSeparator.java
index e69b1d728..02dc3f47e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder_NoSeparator.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputCustomImportOrder_NoSeparator.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 import static java.awt.Button.ABORT;
 import static javax.swing.WindowConstants.*;
 import static java.io.File.createTempFile;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputIllegalImportCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputIllegalImportCheck.java
index a06ea36d5..92a185f6f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputIllegalImportCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputIllegalImportCheck.java
@@ -2,7 +2,7 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import com.puppycrawl.tools.checkstyle.imports.*;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportBug.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportBug.java
index b73ea9d7a..509827bfb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportBug.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportBug.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import java.net.URL;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder.java
index 3286efe22..f057cc9d0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import java.awt.Button;
 import java.awt.Frame;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrderCaseInsensitive.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrderCaseInsensitive.java
index 8b04c55f3..aeb2a23b6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrderCaseInsensitive.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrderCaseInsensitive.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrderStaticGroupOrder.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrderStaticGroupOrder.java
index 2927c9e2b..902f35a8a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrderStaticGroupOrder.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrderStaticGroupOrder.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import static java.lang.Math.abs;
 import static org.antlr.v4.runtime.Recognizer.EOF;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrderStaticGroupOrderBottom.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrderStaticGroupOrderBottom.java
index c519a7804..c41a9900e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrderStaticGroupOrderBottom.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrderStaticGroupOrderBottom.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import org.*;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrderStaticOnDemandGroupOrder.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrderStaticOnDemandGroupOrder.java
index 3c81b5ab6..62317d976 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrderStaticOnDemandGroupOrder.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrderStaticOnDemandGroupOrder.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import static java.lang.Math.*;
 import static org.antlr.v4.runtime.CommonToken.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrderStaticOnDemandGroupOrderBottom.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrderStaticOnDemandGroupOrderBottom.java
index 52b3c962a..ea7244324 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrderStaticOnDemandGroupOrderBottom.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrderStaticOnDemandGroupOrderBottom.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import org.antlr.v4.runtime.*;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_Above.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_Above.java
index e1da50280..edb306ac3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_Above.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_Above.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import static java.awt.Button.ABORT;
 import static javax.swing.WindowConstants.*;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_Bottom.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_Bottom.java
index 9b0527157..33e124d51 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_Bottom.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_Bottom.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import java.awt.Button;
 import java.awt.Dialog;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_EclipseDefaultNegative.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_EclipseDefaultNegative.java
index 4d8552106..86b4f6baf 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_EclipseDefaultNegative.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_EclipseDefaultNegative.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import static com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck.MSG_ORDERING;
 import static java.awt.Button.ABORT;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_EclipseDefaultPositive.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_EclipseDefaultPositive.java
index c1ee02361..e29e4868a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_EclipseDefaultPositive.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_EclipseDefaultPositive.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import static com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck.MSG_ORDERING;
 import static java.awt.Button.ABORT;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_HonorsTokensProperty.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_HonorsTokensProperty.java
index 5d65ac8e5..ed219c2f5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_HonorsTokensProperty.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_HonorsTokensProperty.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
 import static java.awt.Button.ABORT;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_InFlow.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_InFlow.java
index 17f9f7a37..9cf0c8583 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_InFlow.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_InFlow.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import java.awt.Button;
 import static java.awt.Button.ABORT;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_NoFailureForRedundantImports.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_NoFailureForRedundantImports.java
index 28b14040e..0d6a5d9ce 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_NoFailureForRedundantImports.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_NoFailureForRedundantImports.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 public class InputImportOrder_NoFailureForRedundantImports {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_Top.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_Top.java
index 56acca6a4..792e4e698 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_Top.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_Top.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import static java.io.File.createTempFile;
 import static java.awt.Button.ABORT;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_Under.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_Under.java
index 935427f92..310adcb0a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_Under.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_Under.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 import java.awt.Button;
 import java.awt.Frame;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_Wildcard.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_Wildcard.java
index cbac727ab..342841720 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_Wildcard.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_Wildcard.java
@@ -1,9 +1,9 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 // groups are configured as follows
 // com.puppycrawl,*,java
 // the trailing javax.crypto.Cipher; should be flagged as an error.
 
-import com.puppycrawl.tools.checkstyle.imports.InputImportOrder_Above;
+import com.puppycrawl.tools.checkstyle.checks.imports.InputImportOrder_Above;
 import javax.crypto.BadPaddingException;
 import java.util.List; //comment test
 import javax.crypto.Cipher;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_WildcardUnspecified.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_WildcardUnspecified.java
index d31a348f7..b564247f5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputImportOrder_WildcardUnspecified.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputImportOrder_WildcardUnspecified.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
 // groups are configured as follows
 // com.puppycrawl,*,java
@@ -8,7 +8,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
 
-import com.puppycrawl.tools.checkstyle.imports.InputImportBug;
+import com.puppycrawl.tools.checkstyle.checks.imports.InputImportBug;
 
 public class InputImportOrder_WildcardUnspecified {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputRedundantImportCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputRedundantImportCheck.java
index 1f8d8a5aa..a62d5795e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputRedundantImportCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputRedundantImportCheck.java
@@ -2,10 +2,10 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
-import com.puppycrawl.tools.checkstyle.imports.*;
-import com.puppycrawl.tools.checkstyle.imports.InputImportBug;
+import com.puppycrawl.tools.checkstyle.checks.imports.*;
+import com.puppycrawl.tools.checkstyle.checks.imports.InputImportBug;
 import java.io.*;
 import java.lang.*;
 import java.lang.String;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputUnusedImportsCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputUnusedImportsCheck.java
index dda39929f..dc372606b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputUnusedImportsCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputUnusedImportsCheck.java
@@ -2,10 +2,10 @@
 // Test case file for checkstyle.
 // Created: 2001
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle.imports;
+package com.puppycrawl.tools.checkstyle.checks.imports;
 
-import com.puppycrawl.tools.checkstyle.imports.*;
-                                     import com.puppycrawl.tools.checkstyle.imports.InputImportBug;
+import com.puppycrawl.tools.checkstyle.checks.imports.*;
+                                     import com.puppycrawl.tools.checkstyle.checks.imports.InputImportBug;
 import java.io.*;
 import java.lang.*;
 import java.lang.String;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder_NoImports.java b/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder_NoImports.java
deleted file mode 100644
index e958f31dc..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder_NoImports.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.puppycrawl.tools.checkstyle.imports;
-
-
-public class InputCustomImportOrder_NoImports {
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/package-info.java b/src/test/resources/com/puppycrawl/tools/checkstyle/imports/package-info.java
deleted file mode 100644
index bb6c66e9d..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Annotated package definition to check if import is declared unused
-// Created: 2005
-////////////////////////////////////////////////////////////////////////////////
-@MyAnnotation
-package com.puppycrawl.tools.checkstyle.imports;
-
-import com.puppycrawl.tools.checkstyle.MyAnnotation;
\ No newline at end of file