diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
index 1898112f6..3f49efadb 100644
--- a/config/checkstyle_checks.xml
+++ b/config/checkstyle_checks.xml
@@ -276,6 +276,7 @@
     <module name="IllegalImport"/>
     <module name="ImportControl">
       <property name="file" value="${checkstyle.importcontrol.file}"/>
+      <property name="path" value="^.*[\\/]src[\\/]main[\\/].*$"/>
     </module>
     <module name="ImportOrder">
       <property name="groups" value="/^java\./,javax,org"/>
diff --git a/config/import-control.xml b/config/import-control.xml
index 440d652ba..d032e9305 100644
--- a/config/import-control.xml
+++ b/config/import-control.xml
@@ -24,6 +24,10 @@
   <allow class="java.security.MessageDigest" local-only="true"/>
   <allow class="java.security.NoSuchAlgorithmException" local-only="true"/>
   <allow class="javax.xml.bind.DatatypeConverter" local-only="true"/>
+  <allow pkg="com.puppycrawl.tools.checkstyle.grammars" local-only="true"/>
+  <allow pkg="org.apache.commons.cli" local-only="true"/>
+
+  <!-- allowed till https://github.com/checkstyle/checkstyle/issues/3455 -->
   <allow class="com.google.common.base.CaseFormat" local-only="true"/>
   <allow class="com.google.common.io.Closeables" local-only="true"/>
   <allow class="com.google.common.io.Flushables" local-only="true"/>
@@ -31,26 +35,24 @@
   <allow class="com.google.common.collect.ImmutableCollection" local-only="true"/>
   <allow class="com.google.common.collect.ImmutableList" local-only="true"/>
   <allow class="com.google.common.collect.ImmutableMap" local-only="true"/>
-  <allow class="com.google.common.collect.MapDifference" local-only="true"/>
-  <allow class="com.google.common.collect.Maps" local-only="true"/>
   <allow class="com.google.common.collect.Multimap" local-only="true"/>
   <allow class="com.google.common.io.ByteStreams" local-only="true"/>
-  <allow pkg="com.puppycrawl.tools.checkstyle.grammars" local-only="true"/>
-  <allow pkg="org.apache.commons.cli" local-only="true"/>
 
   <subpackage name="utils">
+    <!-- allowed till https://github.com/checkstyle/checkstyle/issues/3455 -->
     <allow class="com.google.common.base.CharMatcher" local-only="true"/>
-    <allow class="com.google.common.collect.ImmutableCollection" local-only="true"/>
     <allow class="com.google.common.collect.ImmutableMap" local-only="true"/>
   </subpackage>
 
   <subpackage name="ant">
-    <allow class="com.google.common.io.Closeables" local-only="true"/>
     <allow pkg="org.apache.tools.ant" local-only="true"/>
     <disallow pkg="com.puppycrawl.tools.checkstyle.checks"/>
     <disallow pkg="com.puppycrawl.tools.checkstyle.filters"/>
     <disallow pkg="com.puppycrawl.tools.checkstyle.doclets"/>
     <disallow pkg="com.puppycrawl.tools.checkstyle.gui"/>
+
+    <!-- allowed till https://github.com/checkstyle/checkstyle/issues/3455 -->
+    <allow class="com.google.common.io.Closeables" local-only="true"/>
   </subpackage>
 
   <subpackage name="api">
@@ -63,49 +65,42 @@
            local-only="true"/>
     <allow class="com.puppycrawl.tools.checkstyle.Utils"
            local-only="true"/>
+
+    <!-- allowed till https://github.com/checkstyle/checkstyle/issues/3455 -->
     <allow class="com.google.common.io.Closeables" local-only="true"/>
     <allow class="com.google.common.collect.ImmutableCollection" local-only="true"/>
     <allow class="com.google.common.collect.ImmutableMap" local-only="true"/>
   </subpackage>
 
   <subpackage name="checks">
+    <allow pkg="java.math"/>
     <allow pkg="com.puppycrawl.tools.checkstyle.checks"/>
     <allow class="com.puppycrawl.tools.checkstyle.Definitions"/>
+
+    <!-- allowed till https://github.com/checkstyle/checkstyle/issues/3455 -->
     <allow class="com.google.common.io.Closeables" local-only="true"/>
     <allow class="com.google.common.collect.HashMultiset" local-only="true"/>
     <allow class="com.google.common.collect.HashMultimap" local-only="true"/>
-    <allow class="com.google.common.collect.ImmutableMap" local-only="true"/>
     <allow class="com.google.common.collect.ImmutableMultiset" local-only="true"/>
-    <allow class="com.google.common.collect.Multimap" local-only="true"/>
     <allow class="com.google.common.collect.Multiset" local-only="true"/>
     <allow class="com.google.common.collect.Multiset.Entry" local-only="true"/>
     <allow class="com.google.common.collect.SetMultimap" local-only="true"/>
-    <allow pkg="java.math"/>
 
     <subpackage name="indentation">
       <allow pkg="java.lang.reflect"/>
-      <allow class="com.google.common.collect.Range" local-only="true"/>
-      <allow class="com.google.common.collect.RangeMap" local-only="true"/>
     </subpackage>
     <subpackage name="header">
       <allow class="java.nio.charset.Charset" local-only="true"/>
+
+      <!-- allowed till https://github.com/checkstyle/checkstyle/issues/3455 -->
       <allow class="com.google.common.io.Closeables" local-only="true"/>
     </subpackage>
     <subpackage name="javadoc">
       <allow pkg="com.puppycrawl.tools.checkstyle.grammars.javadoc"/>
       <allow pkg="java.lang.reflect"/>
+
+      <!-- allowed till https://github.com/checkstyle/checkstyle/issues/3455 -->
       <allow class="com.google.common.base.CharMatcher" local-only="true"/>
-      <allow class="com.google.common.collect.Multiset" local-only="true"/>
-    </subpackage>
-    <subpackage name="design">
-      <allow class="com.google.common.annotations.VisibleForTesting" local-only="true"/>
-      <allow class="com.google.common.collect.ImmutableMap" local-only="true"/>
-    </subpackage>
-    <subpackage name="imports">
-      <allow class="com.google.common.collect.HashMultimap" local-only="true"/>
-    </subpackage>
-    <subpackage name="coding">
-      <allow class="com.google.common.collect.ImmutableCollection" local-only="true"/>
     </subpackage>
   </subpackage>
 
@@ -116,10 +111,6 @@
 
   <subpackage name="filters">
     <allow pkg="java.lang.ref"/>
-    <allow class="com.google.common.io.Closeables" local-only="true"/>
-    <allow class="com.google.common.base.CaseFormat" local-only="true"/>
-    <allow class="com.google.common.collect.ImmutableCollection" local-only="true"/>
-    <allow class="com.google.common.collect.ImmutableMap" local-only="true"/>
     <!-- check's subpackages -->
     <disallow pkg="com\.puppycrawl\.tools\.checkstyle\.checks\.[^.]+" regex="true"/>
     <disallow pkg="com\.puppycrawl\.tools\.checkstyle\.(ant|doclets|gui)" regex="true"/>
@@ -130,9 +121,4 @@
     <allow pkg="javax.swing"/>
     <disallow pkg="com\.puppycrawl\.tools\.checkstyle\.(checks|ant|doclets|filters)" regex="true"/>
   </subpackage>
-
-  <subpackage name="internal">
-    <allow class="com.google.common.reflect.ClassPath" local-only="true"/>
-    <allow class="com.google.common.collect.FluentIterable" local-only="true"/>
-  </subpackage>
 </import-control>