diff --git a/src/main/config/checkstyle-checks.xml b/src/main/config/checkstyle-checks.xml
index 876432880..1c1238554 100644
--- a/src/main/config/checkstyle-checks.xml
+++ b/src/main/config/checkstyle-checks.xml
@@ -18,6 +18,12 @@
         <property name="file" value="${checkstyle.suppressions.file}"/>
     </module>
 
+    <module name="SuppressionCommentFilter">
+        <property name="offCommentFormat" value="CSOFF\: ([\w\|]+)"/>
+        <property name="onCommentFormat" value="CSON\: ([\w\|]+)"/>
+        <property name="checkFormat" value="$1"/>
+    </module>
+
     <module name="JavadocPackage">
         <property name="allowLegacy" value="false"/>
     </module>
@@ -53,7 +59,7 @@
 
     <module name="TreeWalker">
         <property name="tabWidth" value="4"/>
-
+        <module name="FileContentsHolder"/>
         <module name="AvoidStarImport"/>
         <module name="ConstantName"/>
         <module name="EmptyBlock"/>