diff --git a/.pmd-ruleset.xml b/.pmd-ruleset.xml
index 2f55d2722..f56ff63ce 100644
--- a/.pmd-ruleset.xml
+++ b/.pmd-ruleset.xml
@@ -24,7 +24,7 @@
     <rule ref="category/java/bestpractices.xml/GuardLogStatement" />
     <rule ref="category/java/bestpractices.xml/ImplicitFunctionalInterface" />
     <rule ref="category/java/bestpractices.xml/JUnit4SuitesShouldUseSuiteAnnotation" />
-    <rule ref="category/java/bestpractices.xml/JUnit5TestShouldBePackagePrivate" />
+    <rule ref="category/java/bestpractices.xml/JUnitJupiterTestShouldBePackagePrivate" />
     <rule ref="category/java/bestpractices.xml/JUnitUseExpected" />
     <rule ref="category/java/bestpractices.xml/MethodReturnsInternalArray" />
     <rule ref="category/java/bestpractices.xml/MissingOverride" />
diff --git a/build.gradle b/build.gradle
index f2476fad0..474521e58 100644
--- a/build.gradle
+++ b/build.gradle
@@ -152,7 +152,7 @@ if (isJava21orHigher) {
 // PMD linter
 
 pmd {
-  toolVersion = "7.24.0"
+  toolVersion = "7.25.0"
   ruleSetFiles = files("${rootDir}/.pmd-ruleset.xml")
   consoleOutput = true
   ignoreFailures = false
diff --git a/src/main/java/org/plumelib/util/FilesPlume.java b/src/main/java/org/plumelib/util/FilesPlume.java
index 7f951521b..927613a1e 100644
--- a/src/main/java/org/plumelib/util/FilesPlume.java
+++ b/src/main/java/org/plumelib/util/FilesPlume.java
@@ -1313,7 +1313,8 @@ public static void streamCopy(InputStream from, OutputStream to) {
    * @param is input stream to read
    * @return a String containing all the characters from the input stream
    */
-  @SuppressWarnings("JdkObsolete") // due to use of string "UTF-8", remove in Java 11+
+  // due to use of string "UTF-8", remove in Java 11+
+  @SuppressWarnings({"JdkObsolete", "PMD.UseStandardCharsets"})
   public static String streamString(InputStream is) {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     streamCopy(is, baos);