diff --git a/build.gradle b/build.gradle
index 389791fe5..0ea9f68bd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -304,7 +304,7 @@ subprojects {
 
 	checkstyle {
 		configFile = new File(rootConfigDir, 'checkstyle.xml')
-		toolVersion = '7.7'
+		toolVersion = '8.8'
 	}
 	task sourcesJar(type: Jar, dependsOn: classes) {
 		classifier = 'sources'
diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index 756ef5ea7..653811021 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -6,7 +6,6 @@
 	<module name="SuppressionFilter">
 		<property name="file" value="config/suppressions.xml"/>
 	</module>
-	<module name="SuppressionCommentFilter"/>
 	<module name="Header">
 		<property name="headerFile" value="config/${checkstyleLicenseHeader}.txt"/>
 		<property name="ignoreLines" value="3"/>
@@ -66,8 +65,8 @@
 	</module>
 	<module name="JavadocPackage"/>
 	<module name="TreeWalker">
+		<module name="SuppressionCommentFilter"/>
 		<module name="FinalClass"/>
-		<module name="FileContentsHolder"/>
 		<module name="UnusedImports">
 			<property name="processJavadoc" value="true"/>
 		</module>