diff --git a/pom.xml b/pom.xml
index 5a42b88f7..98a607551 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,7 @@
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -536,7 +536,6 @@
       </plugin>              
     </plugins>
   </reporting>
-
   <profiles>
     <profile>
       <id>setup-checkout</id>
@@ -680,6 +679,18 @@
       </properties>
     </profile>
   </profiles>
+  <repositories>
+    <repository>
+      <id>apache.snapshots</id>
+      <url>https://repository.apache.org/snapshots/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+  </repositories>
   <developers>
     <developer>
       <name>Rob Tompkins</name>
diff --git a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java
index e637d1d45..872a7ffef 100644
--- a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java
+++ b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java
@@ -14,44 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.commons.release.plugin.mojos;
 
 import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
 
-import org.apache.maven.plugin.testing.MojoRule;
+import org.apache.maven.api.plugin.testing.InjectMojo;
+import org.apache.maven.api.plugin.testing.MojoTest;
 import org.codehaus.plexus.util.FileUtils;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link CommonsDistributionStagingMojo}.
  */
+@MojoTest
 public class CommonsDistributionStagingMojoTest {
 
     private static final String COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH = "target/testing-commons-release-plugin";
 
-    @Rule
-    public final MojoRule rule = new MojoRule() {
-        @Override
-        protected void after() {
-            // noop
-        }
-
-        @Override
-        protected void before() throws Throwable {
-            // noop
-        }
-    };
-
-    private CommonsDistributionDetachmentMojo detachmentMojo;
-
-    private CommonsDistributionStagingMojo mojoForTest;
-
     private void assertRequisiteFilesExist() {
         final File targetScmDirectory = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1");
         final File releaseNotes = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/RELEASE-NOTES.txt");
@@ -105,7 +89,7 @@ private void assertRequisiteFilesExist() {
         assertTrue(siteSubdirectoryIndexHtml.exists());
     }
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         final File testingDirectory = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH);
         if (testingDirectory.exists()) {
@@ -114,26 +98,19 @@ public void setUp() throws Exception {
     }
 
     @Test
-    public void testDisabled() throws Exception {
-        final File testPom = new File("src/test/resources/mojos/stage-distributions/stage-distributions-disabled.xml");
-        assertNotNull(testPom);
-        assertTrue(testPom.exists());
-        mojoForTest = (CommonsDistributionStagingMojo) rule.lookupMojo("stage-distributions", testPom);
+    public void testDisabled(
+            @InjectMojo(goal = "stage-distributions", pom = "src/test/resources/mojos/stage-distributions/stage-distributions-disabled.xml") final CommonsDistributionStagingMojo mojoForTest)
+            throws Exception {
         mojoForTest.execute();
         final File testingDirectory = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH);
         assertFalse(testingDirectory.exists());
     }
 
     @Test
-    public void testSuccess() throws Exception {
-        final File testPom = new File("src/test/resources/mojos/stage-distributions/stage-distributions.xml");
-        assertNotNull(testPom);
-        assertTrue(testPom.exists());
-        final File detachmentPom = new File("src/test/resources/mojos/detach-distributions/detach-distributions.xml");
-        assertNotNull(detachmentPom);
-        assertTrue(detachmentPom.exists());
-        mojoForTest = (CommonsDistributionStagingMojo) rule.lookupMojo("stage-distributions", testPom);
-        detachmentMojo = (CommonsDistributionDetachmentMojo) rule.lookupMojo("detach-distributions", detachmentPom);
+    public void testSuccess(
+            @InjectMojo(goal = "stage-distributions", pom = "src/test/resources/mojos/stage-distributions/stage-distributions.xml") final CommonsDistributionStagingMojo mojoForTest,
+            @InjectMojo(goal = "detach-distributions", pom = "src/test/resources/mojos/detach-distributions/detach-distributions.xml") final CommonsDistributionDetachmentMojo detachmentMojo)
+            throws Exception {
         detachmentMojo.execute();
         final File releaseNotesBasedir = new File("src/test/resources/mojos/stage-distributions/");
         mojoForTest.setBaseDir(releaseNotesBasedir);