diff --git a/sun_checks.xml b/sun_checks.xml
index eca369c..c81c30c 100644
--- a/sun_checks.xml
+++ b/sun_checks.xml
@@ -95,18 +95,9 @@
   <!--   <property name="headerFile" value="${checkstyle.header.file}"/> -->
   <!--   <property name="fileExtensions" value="java"/> -->
   <!-- </module> -->
-
+  <module name="SuppressWarningsFilter" />
   <module name="TreeWalker">
-    <module name="SuppressWarnings">
-      <property name="format"
-          value="^unchecked$|^unused$"/>
-      <property name="tokens"
-        value="
-        CLASS_DEF,INTERFACE_DEF,ENUM_DEF,
-        ANNOTATION_DEF,ANNOTATION_FIELD_DEF,
-        ENUM_CONSTANT_DEF,METHOD_DEF,CTOR_DEF
-        "/>
-    </module>
+    <module name="SuppressWarningsHolder" />
 
     <!-- Checks for Javadoc comments.                     -->
     <!-- See https://checkstyle.org/checks/javadoc/index.html -->