diff --git a/pom.xml b/pom.xml
index d9b3b1660..06bbd28ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>7.6</version>
+                            <version>8.18</version>
                         </dependency>
                     </dependencies>
                 </plugin>
diff --git a/sun_checks_neemann.xml b/sun_checks_neemann.xml
index 1bda4d049..6c1122a8c 100644
--- a/sun_checks_neemann.xml
+++ b/sun_checks_neemann.xml
@@ -39,12 +39,6 @@
         <property name="basedir" value="${basedir}"/>
     -->
 
-    <module name="SuppressionCommentFilter">
-        <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
-        <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
-        <property name="checkFormat" value="$1"/>
-    </module>
-
     <!-- Checks that a package-info.java file exists for each package.     -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
     <module name="JavadocPackage"/>
@@ -79,7 +73,11 @@
 
     <module name="TreeWalker">
 
-        <module name="FileContentsHolder"/>
+        <module name="SuppressionCommentFilter">
+            <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+            <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+            <property name="checkFormat" value="$1"/>
+        </module>
 
         <!-- Checks for Javadoc comments.                     -->
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->