diff --git a/codestyle/checkstyle-suppressions.xml b/codestyle/checkstyle-suppressions.xml
index 01868d73f34..a19500bd09f 100644
--- a/codestyle/checkstyle-suppressions.xml
+++ b/codestyle/checkstyle-suppressions.xml
@@ -24,28 +24,14 @@
     "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <suppressions>
-  <!-- See http://checkstyle.sourceforge.net/config_filters.html#SuppressionFilter for examples -->
+  <!-- See https://checkstyle.org/filters/suppressionfilter.html for examples -->
 
   <!-- Code copied from TestNG to apply a bugfix -->
   <suppress checks="AvoidStaticImport" files="[\\/]org[\\/]testng[\\/]" />
 
-  <suppress checks="Header" files="[\\/]target[\\/]generated-test-sources[\\/]" />
-  <suppress checks="NeedBraces" files="[\\/]target[\\/]generated-test-sources[\\/]" />
-  <suppress checks="UnusedImports" files="[\\/]target[\\/]generated-test-sources[\\/]" />
-  <suppress checks="AvoidStarImport" files="[\\/]target[\\/]generated-test-sources[\\/]" />
-  <suppress checks="FileTabCharacter" files="[\\/]target[\\/]generated-test-sources[\\/]" />
+  <suppress checks=".*" files="[\\/]target[\\/]generated-sources[\\/]" />
+  <suppress checks=".*" files="[\\/]target[\\/]generated-test-sources[\\/]" />
 
-  <suppress checks="WhitespaceAfter" files="[\\/]target[\\/]generated-test-sources[\\/]" />
-  <suppress checks="WhitespaceAround" files="[\\/]target[\\/]generated-test-sources[\\/]" />
-  <suppress checks="ParenPad" files="[\\/]target[\\/]generated-test-sources[\\/]" />
-  <suppress checks="SingleSpaceSeparator" files="[\\/]target[\\/]generated-test-sources[\\/]" />
-  <suppress checks="NoWhitespaceBefore" files="[\\/]target[\\/]generated-test-sources[\\/]" />
-  <suppress checks="NoWhitespaceAfter" files="[\\/]target[\\/]generated-test-sources[\\/]" />
-
-  <suppress checks="LeftCurly" files="[\\/]target[\\/]generated-test-sources[\\/]" />
-  <suppress checks="RightCurly" files="[\\/]target[\\/]generated-test-sources[\\/]" />
-
-  <suppress checks="Indentation" files="[\\/]target[\\/]generated-test-sources[\\/]" />
   <suppress checks="Indentation" files="ProtoTestEventWrapper.java" />
   <suppress checks="Regexp" id="argumentLineBreaking" files="ProtoTestEventWrapper.java" />
   <suppress checks="[a-zA-Z0-9]*" files="ProtoTestEventWrapper.java" />
@@ -56,7 +42,6 @@
   <suppress checks="ConstantName" files="Author" />
   <suppress checks="ConstantName" files="Book" />
 
-  <suppress checks="OneStatementPerLine" files="[\\/]target[\\/]generated-test-sources[\\/]" />
 
   <!-- extendedset is a fork of Alessandro Colantonio's CONCISE (COmpressed 'N' Composable Integer SEt) repository
        and licensed to ASF under a CLA is not true. -->
@@ -67,7 +52,5 @@
   <!-- See https://github.com/checkstyle/checkstyle/issues/5510 and the ImportOrder definition in checkstyle.xml -->
   <suppress checks="ImportOrder" message="^'java\..*'.*" />
 
-  <suppress checks="ImportOrder" files="[\\/]target[\\/]generated-test-sources[\\/]" />
-  <suppress checks="EmptyLineSeparator" files="[\\/]target[\\/]generated-test-sources[\\/]" />
   <suppress checks="AvoidStaticImport" files="[\\/]src[\\/](test)[\\/]"/>
 </suppressions>
diff --git a/pom.xml b/pom.xml
index ead448ce6ef..8c3b26fbaf4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2089,9 +2089,14 @@
                                 <exclude>**/test/resources/**/*</exclude> <!-- test data for "old" ITs. -->
                                 <exclude>**/docker/client_tls/*</exclude> <!-- generated files for "old" ITs. -->
                                 <exclude>resources/data/**/*</exclude> <!-- test data for "new" ITs. -->
-                                <exclude>**/derby.log</exclude>
                                 <exclude>**/jvm.config</exclude>
                                 <exclude>**/*.avsc</exclude>
+                                <exclude>**/*.png</exclude>
+                                <exclude>**/*.log</exclude>
+                                <exclude>**/*.jpg</exclude>
+                                <exclude>**/*.gif</exclude>
+                                <exclude>examples/quickstart/protobuf/metrics.desc</exclude>
+                                <exclude>examples/var/sv/.lock</exclude>
                                 <exclude>**/*.iml</exclude>
                                 <exclude>**/*.json</exclude>
                                 <exclude>**/*.parq</exclude>