diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java
index aaed8aa0a..5496dbc6f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java
@@ -104,7 +104,7 @@ public class CustomImportOrderCheckTest extends BaseCheckTestSupport
             "15: Wrong lexicographical order for 'java.io.InputStream' import.",
             "18: Import statement is in the wrong order. Should be in the 'SAME_PACKAGE' group.",
             "20: Imports without groups should be placed at the end of the import list.",
-            "21: 'org.apache.*'should be separated from previous import group.",
+            "21: 'org.junit.*'should be separated from previous import group.",
         };
 
         verify(checkConfig, getPath("imports" + File.separator
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder.java b/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder.java
index c8f37df2c..625ae07fe 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder.java
@@ -18,7 +18,7 @@ import java.io.Reader;
 import com.puppycrawl.tools.*;
 
 import com.google.common.*;
-import org.apache.*;
+import org.junit.*;
 
 public class InputCustomImportOrder {
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/FromGuava.java b/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/FromGuava.java
index ddac3258a..5ee5ca66d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/FromGuava.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/FromGuava.java
@@ -99,7 +99,7 @@ class LocalCache<K, V> extends AbstractMap<K, V> implements ConcurrentMap<K, V>
     STRONG_ACCESS {
       <K, V> StrongAccessEntry<K, V> newEntry(
           Segment<K, V> segment, K key, int hash, @Nullable ReferenceEntry<K, V> next) {
-        return new StrongAccessEntry<K, V>((int) key, hash, next);
+        return new StrongAccessEntry<K, V>(key, hash, next);
       }
 
       <K, V> ReferenceEntry<K, V> copyEntry(
@@ -219,7 +219,7 @@ class LocalCache<K, V> extends AbstractMap<K, V> implements ConcurrentMap<K, V>
 
   private static class StrongAccessEntry<T1, T2> {
 
-    public StrongAccessEntry(int key, int hash, ReferenceEntry<T1, T2> next)
+    public StrongAccessEntry(T1 key, int hash, ReferenceEntry<T1, T2> next)
     {
 
     }