diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
index e476aac81..9a433aa1e 100644
--- a/config/checkstyle_checks.xml
+++ b/config/checkstyle_checks.xml
@@ -265,9 +265,9 @@
     <module name="UnnecessaryParentheses"/>
     <module name="AbbreviationAsWordInName"/>
     <module name="AvoidEscapedUnicodeCharacters"/>
+    <module name="AbstractClassName"/>
 
 <!--
-    <module name="AbstractClassName"/>
     <module name="AvoidInlineConditionals"/>
     <module name="BooleanExpressionComplexity"/>
     <module name="ClassDataAbstractionCoupling"/>
diff --git a/config/suppressions.xml b/config/suppressions.xml
index 9f483d3ba..e59b122f1 100644
--- a/config/suppressions.xml
+++ b/config/suppressions.xml
@@ -21,6 +21,14 @@
     <suppress checks="AvoidEscapedUnicodeCharactersCheck"
               files="AvoidEscapedUnicodeCharactersCheck.java"/>
 
+    <!-- Can not change API -->
+    <suppress checks="AbstractClassNameCheck"
+              files="Check.java"/>
+
+    <!-- 'Abstract' pattern is used to show it is checking for abstract class name -->
+    <suppress checks="AbstractClassNameCheck"
+              files="AbstractClassNameCheck.java"/>
+
     <!-- Tone down the checking for test code -->
     <suppress checks="EmptyBlock" files=".*[\\/]src[\\/]test[\\/]"/>
     <suppress checks="ImportControl" files=".*[\\/]src[\\/]test[\\/]"/>