diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 158ccbbbb9b..3a88f90de8c 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -224,9 +224,12 @@
             <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
             <property name="checkFormat" value="$1"/>
         </module>
-
+        <!-- Make the @SuppressWarnings annotations available to Checkstyle -->
+        <module name="SuppressWarningsHolder" />
     </module>
 
+    <module name="SuppressWarningsFilter" />
+
     <module name="SuppressionFilter">
         <property name="file" value="${config_loc}/suppressions.xml"/>
     </module>