diff --git a/geowebcache/pmd-junit-ruleset.xml b/geowebcache/pmd-junit-ruleset.xml
index 66c500dca..556c6cb0d 100644
--- a/geowebcache/pmd-junit-ruleset.xml
+++ b/geowebcache/pmd-junit-ruleset.xml
@@ -22,9 +22,9 @@ under the License.
 GeoTools Junit ruleset. See https://pmd.github.io/latest/pmd_userdocs_understanding_rulesets.html
 </description>
   <rule ref="category/java/bestpractices.xml/SimplifiableTestAssertion" />
-  <rule ref="category/java/bestpractices.xml/JUnit4TestShouldUseBeforeAnnotation" />
-  <rule ref="category/java/bestpractices.xml/JUnit4TestShouldUseAfterAnnotation" />
-  <rule ref="category/java/bestpractices.xml/JUnit4TestShouldUseTestAnnotation" />
+  <rule ref="category/java/bestpractices.xml/UnitTestShouldUseBeforeAnnotation" />
+  <rule ref="category/java/bestpractices.xml/UnitTestShouldUseAfterAnnotation" />
+  <rule ref="category/java/bestpractices.xml/UnitTestShouldUseTestAnnotation" />
   <!-- Excluded due to https://github.com/pmd/pmd/issues/2147 /-->
   <!-- rule ref="category/java/bestpractices.xml/JUnitTestsShouldIncludeAssert" /-->
   <rule name="DisallowJunit3"
diff --git a/geowebcache/pom.xml b/geowebcache/pom.xml
index 6a2dc7818..aedeea744 100644
--- a/geowebcache/pom.xml
+++ b/geowebcache/pom.xml
@@ -87,9 +87,9 @@
     <jackson.databind.version>${jackson.version}</jackson.databind.version>
     <jetty.version>9.4.55.v20240627</jetty.version>
     <errorProneFlags></errorProneFlags>
-    <errorProne.version>2.24.1</errorProne.version>
+    <errorProne.version>2.31.0</errorProne.version>
     <javac.version>9+181-r4173-1</javac.version>
-    <pmd.version>7.10.0</pmd.version>
+    <pmd.version>7.13.0</pmd.version>
     <checkstyle.skip>false</checkstyle.skip>
     <qa>false</qa>
     <lint>deprecation,unchecked</lint>
@@ -918,7 +918,7 @@
               <fork>false</fork>
               <compilerArgs>
                 <arg>-XDcompilePolicy=simple</arg>
-                <arg>-Xplugin:ErrorProne -XepExcludedPaths:${project.build.directory}/generated-sources/.* ${errorProneFlags}</arg>
+                <arg>-Xplugin:ErrorProne -XepExcludedPaths:${project.build.directory}/generated-sources/.* -Xep:SelfAssertion:OFF ${errorProneFlags}</arg>
                 <arg>-Xlint:${lint}</arg>
                 <arg>-Werror</arg>
               </compilerArgs>