diff --git a/pom.xml b/pom.xml
index 27129c7..ed7b841 100644
--- a/pom.xml
+++ b/pom.xml
@@ -571,7 +571,7 @@ under the License.
     <commons.jira.pid>12310484</commons.jira.pid>
     <!-- The RC version used in the staging repository URL. -->
     <commons.rc.version>RC2</commons.rc.version>
-    <commons.surefire.version>2.22.2</commons.surefire.version>
+    <commons.surefire.version>3.0.0-M5</commons.surefire.version>
     <spotbugs.plugin.version>4.5.2.0</spotbugs.plugin.version>
     <spotbugs.impl.version>4.5.2</spotbugs.impl.version>    
     <skipSurefireReport>true</skipSurefireReport>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 898a3cf..8636c44 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -76,8 +76,11 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="update" due-to="Dependabot">
         Bump findbugs-maven-plugin from 2.5.2 to 3.0.5 #8.
       </action>
-      <action dev="ggregory" type="update" due-to="Dependabot">
-        Bump maven-failsafe-plugin from 2.12 to 2.22.2 #31.
+      <action dev="ggregory" type="update" due-to="Dependabot, Gary Gregory">
+        Bump maven-failsafe-plugin from 2.12 to 3.0.0-M5 #31.
+      </action>
+      <action dev="ggregory" type="update" due-to="Gary Gregory">
+        Bump spotbugs-surefire-plugin from 2.22.2 to 3.0.0-M5.
       </action>
       <action dev="ggregory" type="update" due-to="Dependabot">
         Bump maven-dependency-plugin from 2.4 to 3.1.2 #29.