diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
index dd102201c..3753133bd 100644
--- a/config/checkstyle_checks.xml
+++ b/config/checkstyle_checks.xml
@@ -306,6 +306,7 @@
 
     <module name="ModifiedControlVariable"/>
     <module name="AvoidInlineConditionals"/>
+    <module name="IllegalType"/>
 
 <!--
     <module name="ClassDataAbstractionCoupling"/>
@@ -313,7 +314,6 @@
     <module name="ExecutableStatementCount"/>
     <module name="FinalParameters"/>
     <module name="IllegalToken"/>
-    <module name="IllegalType"/>
     <module name="JavadocParagraph"/>
     <module name="JavadocTagContinuationIndentation"/>
     <module name="JavaNCSS"/>
diff --git a/config/suppressions.xml b/config/suppressions.xml
index 0cd5ff121..80ddbc8fa 100644
--- a/config/suppressions.xml
+++ b/config/suppressions.xml
@@ -60,4 +60,7 @@
 
     <suppress checks="." files=".*JavadocTokenTypes\.java"/>
     <suppress checks="." files=".*ParseTreeBuilder\.java"/>
+
+    <!-- Should be solved after fixing https://github.com/checkstyle/checkstyle/issues/1805 -->
+    <suppress checks="IllegalType" files=".*[\\/]src[\\/]test[\\/]|(AbstractTypeAwareCheck|TryHandler|SlistHandler|PrimordialHandler|MethodCallHandler|MemberDefHandler|IndentationCheck|IfHandler|HandlerFactory|CaseHandler|BlockParentHandler|AbstractExpressionHandler|JavadocMethodCheck|DetectorOptions)\.java"/>
 </suppressions>