diff --git a/pom.xml b/pom.xml
index e2132925..1c432664 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,6 +242,10 @@ under the License.
           <groupId>xml-apis</groupId>
           <artifactId>xml-apis</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -318,14 +322,6 @@ under the License.
       <artifactId>rome</artifactId>
       <version>2.1.0</version>
     </dependency>
-
-    <!-- test dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
@@ -356,6 +352,11 @@ under the License.
       <version>${mavenResolverVersion}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/src/test/java/org/apache/maven/plugins/changes/ActionTest.java b/src/test/java/org/apache/maven/plugins/changes/ActionTest.java
index 81acd210..03703d80 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ActionTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ActionTest.java
@@ -19,51 +19,57 @@
 package org.apache.maven.plugins.changes;
 
 import junit.framework.Test;
-import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import org.apache.maven.plugins.changes.model.Action;
 
-public class ActionTest extends TestCase {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ActionTest {
     Action action = new Action();
 
     public ActionTest(String testName) {
-        super(testName);
     }
 
     public static Test suite() {
         return new TestSuite(ActionTest.class);
     }
 
+    @org.junit.jupiter.api.Test
     public void testGetSetAction() {
         action.setAction("action");
 
         assertEquals("action", action.getAction());
     }
 
+    @org.junit.jupiter.api.Test
     public void testGetSetDev() {
         action.setDev("developer");
 
         assertEquals("developer", action.getDev());
     }
 
+    @org.junit.jupiter.api.Test
     public void testGetSetType() {
         action.setType("type");
 
         assertEquals("type", action.getType());
     }
 
+    @org.junit.jupiter.api.Test
     public void testGetSetIssue() {
         action.setIssue("issue");
 
         assertEquals("issue", action.getIssue());
     }
 
+    @org.junit.jupiter.api.Test
     public void testGetSetDueTo() {
         action.setDueTo("due-to");
 
         assertEquals("due-to", action.getDueTo());
     }
 
+    @org.junit.jupiter.api.Test
     public void testGetSetDueToEmail() {
         action.setDueToEmail("due-to-mail");
 
diff --git a/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java b/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java
index 010c8cc5..50abf258 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java
@@ -18,11 +18,11 @@
  */
 package org.apache.maven.plugins.changes;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
  * @author Dennis Lundberg
diff --git a/src/test/java/org/apache/maven/plugins/changes/ChangesValidatorMojoTest.java b/src/test/java/org/apache/maven/plugins/changes/ChangesValidatorMojoTest.java
index 91645d0f..9603938c 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ChangesValidatorMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ChangesValidatorMojoTest.java
@@ -22,6 +22,10 @@
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Olivier Lamy
@@ -32,12 +36,14 @@ public class ChangesValidatorMojoTest extends AbstractMojoTestCase {
 
     protected ChangesValidatorMojo mojo;
 
+    @BeforeEach
     public void setUp() throws Exception {
         super.setUp();
         File pom = new File(getBasedir(), "/src/test/unit/plugin-config.xml");
         mojo = lookupMojo("changes-validate", pom);
     }
 
+    @Test
     public void testValidationSuccess() throws Exception {
         File changesXml = new File(getBasedir(), "/src/test/unit/changes.xml");
         setVariableValueToObject(mojo, "xmlPath", changesXml);
@@ -46,6 +52,7 @@ public void testValidationSuccess() throws Exception {
         mojo.execute();
     }
 
+    @Test
     public void testValidationFailedWithMojoFailure() throws Exception {
         File changesXml = new File(getBasedir(), "/src/test/unit/non-valid-changes.xml");
         setVariableValueToObject(mojo, "xmlPath", changesXml);
@@ -59,6 +66,7 @@ public void testValidationFailedWithMojoFailure() throws Exception {
         }
     }
 
+    @Test
     public void testValidationFailedWithNoMojoFailure() throws Exception {
         File changesXml = new File(getBasedir(), "/src/test/unit/non-valid-changes.xml");
         setVariableValueToObject(mojo, "xmlPath", changesXml);
diff --git a/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java b/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java
index d8f820b8..f8b1fccf 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java
@@ -24,11 +24,11 @@
 import org.apache.maven.plugin.testing.SilentLog;
 import org.apache.maven.plugins.changes.model.Action;
 import org.apache.maven.plugins.changes.model.Release;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Olivier Lamy
diff --git a/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java b/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java
index 006ed6ef..7b839547 100644
--- a/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java
@@ -25,29 +25,35 @@
 import java.util.List;
 import java.util.Locale;
 
-import junit.framework.TestCase;
 import org.apache.maven.plugins.changes.model.Release;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author ltheussl
  */
-public class FeedGeneratorTest extends TestCase {
+public class FeedGeneratorTest {
     /**
      * Test of isSupportedFeedType method, of class FeedGenerator.
      */
+    @Test
     public void testIsSupportedFeedType() {
         final FeedGenerator generator = new FeedGenerator(Locale.ENGLISH);
 
-        assertTrue("rss_0.9 not supported?", generator.isSupportedFeedType("rss_0.9"));
-        assertTrue("rss_0.91N not supported?", generator.isSupportedFeedType("rss_0.91N"));
-        assertTrue("rss_0.91U not supported?", generator.isSupportedFeedType("rss_0.91U"));
-        assertTrue("rss_0.92 not supported?", generator.isSupportedFeedType("rss_0.92"));
-        assertTrue("rss_0.93 not supported?", generator.isSupportedFeedType("rss_0.93"));
-        assertTrue("rss_0.94 not supported?", generator.isSupportedFeedType("rss_0.94"));
-        assertTrue("rss_1.0 not supported?", generator.isSupportedFeedType("rss_1.0"));
-        assertTrue("rss_2.0 not supported?", generator.isSupportedFeedType("rss_2.0"));
-        assertTrue("atom_0.3 not supported?", generator.isSupportedFeedType("atom_0.3"));
-        assertTrue("atom_1.0 not supported?", generator.isSupportedFeedType("atom_1.0"));
+        assertTrue(generator.isSupportedFeedType("rss_0.9"), "rss_0.9 not supported?");
+        assertTrue(generator.isSupportedFeedType("rss_0.91N"), "rss_0.91N not supported?");
+        assertTrue(generator.isSupportedFeedType("rss_0.91U"), "rss_0.91U not supported?");
+        assertTrue(generator.isSupportedFeedType("rss_0.92"), "rss_0.92 not supported?");
+        assertTrue(generator.isSupportedFeedType("rss_0.93"), "rss_0.93 not supported?");
+        assertTrue(generator.isSupportedFeedType("rss_0.94"), "rss_0.94 not supported?");
+        assertTrue(generator.isSupportedFeedType("rss_1.0"), "rss_1.0 not supported?");
+        assertTrue(generator.isSupportedFeedType("rss_2.0"), "rss_2.0 not supported?");
+        assertTrue(generator.isSupportedFeedType("atom_0.3"), "atom_0.3 not supported?");
+        assertTrue(generator.isSupportedFeedType("atom_1.0"), "atom_1.0 not supported?");
 
         assertFalse(generator.isSupportedFeedType(""));
         assertFalse(generator.isSupportedFeedType(null));
@@ -59,6 +65,7 @@ public void testIsSupportedFeedType() {
      *
      * @throws Exception if any.
      */
+    @Test
     public void testExport() throws Exception {
         final FeedGenerator generator = new FeedGenerator(Locale.ENGLISH);
         generator.setAuthor("author");
diff --git a/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java b/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java
index bdebac9b..03989565 100644
--- a/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/IssueAdapterTest.java
@@ -21,20 +21,23 @@
 import java.util.Arrays;
 import java.util.List;
 
-import junit.framework.TestCase;
 import org.apache.maven.plugins.changes.issues.Issue;
 import org.apache.maven.plugins.changes.issues.IssueManagementSystem;
 import org.apache.maven.plugins.changes.jira.JIRAIssueManagementSystem;
 import org.apache.maven.plugins.changes.model.Action;
 import org.apache.maven.plugins.changes.model.Release;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Alan Parkinson
  * @version $Id$
  * @since 2.6
  */
-public class IssueAdapterTest extends TestCase {
+public class IssueAdapterTest {
 
+    @Test
     public void testDefaultIssueTypeMapping() {
         IssueAdapter adapter = new IssueAdapter(new JIRAIssueManagementSystem());
 
@@ -67,6 +70,7 @@ public void testDefaultIssueTypeMapping() {
         assertEquals("", action.getType());
     }
 
+    @Test
     public void testCustomIssueTypeMappingOveridesDefaultMapping() {
         IssueManagementSystem ims = new JIRAIssueManagementSystem();
 
@@ -90,6 +94,7 @@ public void testCustomIssueTypeMappingOveridesDefaultMapping() {
         assertEquals("", action.getType());
     }
 
+    @Test
     public void testCustomIssueTypeMapping() {
         IssueManagementSystem ims = new JIRAIssueManagementSystem();
         ims.getIssueTypeMap().put("Story", IssueType.ADD);
@@ -137,6 +142,7 @@ private Issue createIssue(String key, String type, String version) {
         return issue;
     }
 
+    @Test
     public void testReleaseOrder() {
         IssueManagementSystem ims = new JIRAIssueManagementSystem();
         ims.getIssueTypeMap().put("Story", IssueType.ADD);
diff --git a/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java b/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java
index 1826f642..82548da4 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java
@@ -22,34 +22,37 @@
 import java.util.List;
 
 import junit.framework.Test;
-import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import org.apache.maven.plugins.changes.model.Action;
 import org.apache.maven.plugins.changes.model.Release;
 
-public class ReleaseTest extends TestCase {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ReleaseTest {
     Release release = new Release();
 
     public ReleaseTest(String testName) {
-        super(testName);
     }
 
     public static Test suite() {
         return new TestSuite(ReleaseTest.class);
     }
 
+    @org.junit.jupiter.api.Test
     public void testGetSetVersion() {
         release.setVersion("version");
 
         assertEquals("version", release.getVersion());
     }
 
+    @org.junit.jupiter.api.Test
     public void testGetSetDateRelease() {
         release.setDateRelease("12-09-1979");
 
         assertEquals("12-09-1979", release.getDateRelease());
     }
 
+    @org.junit.jupiter.api.Test
     public void testGetSetAction() {
         List<Action> actionList = new ArrayList<>();
 
diff --git a/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTest.java b/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTest.java
index 7eba52a9..a774dc52 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTest.java
@@ -22,9 +22,9 @@
 import java.util.List;
 
 import org.apache.maven.plugins.changes.model.Release;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Dennis Lundberg
@@ -41,21 +41,21 @@ public void testMergeReleases() {
         List<Release> mergedReleases;
 
         mergedReleases = ReleaseUtils.mergeReleases(firstReleases, secondReleases);
-        assertEquals("Both empty", 0, mergedReleases.size());
+        assertEquals(0, mergedReleases.size(), "Both empty");
 
         Release release = new Release();
         release.setVersion("1.0");
         firstReleases.add(release);
 
         mergedReleases = ReleaseUtils.mergeReleases(firstReleases, secondReleases);
-        assertEquals("One release in first", 1, mergedReleases.size());
+        assertEquals(1, mergedReleases.size(), "One release in first");
 
         release = new Release();
         release.setVersion("1.1");
         secondReleases.add(release);
 
         mergedReleases = ReleaseUtils.mergeReleases(firstReleases, secondReleases);
-        assertEquals("One release each", 2, mergedReleases.size());
+        assertEquals(2, mergedReleases.size(), "One release each");
 
         release = new Release();
         release.setVersion("1.1");
@@ -63,15 +63,15 @@ public void testMergeReleases() {
 
         mergedReleases = ReleaseUtils.mergeReleases(firstReleases, secondReleases);
         assertEquals(
-                "Two releases in first, one release in second with one version being the same",
                 2,
-                mergedReleases.size());
+                mergedReleases.size(),
+                "Two releases in first, one release in second with one version being the same");
 
         release = new Release();
         release.setVersion("1.2");
         secondReleases.add(release);
 
         mergedReleases = ReleaseUtils.mergeReleases(firstReleases, secondReleases);
-        assertEquals("Two releases each with one version being the same", 3, mergedReleases.size());
+        assertEquals(3, mergedReleases.size(), "Two releases each with one version being the same");
     }
 }
diff --git a/src/test/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojoTest.java b/src/test/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojoTest.java
index 4b4af6a7..b491f545 100644
--- a/src/test/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/announcement/AnnouncementMojoTest.java
@@ -23,6 +23,9 @@
 
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
 import org.codehaus.plexus.util.FileUtils;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Olivier Lamy
@@ -30,6 +33,7 @@
  */
 public class AnnouncementMojoTest extends AbstractMojoTestCase {
 
+    @Test
     public void testAnnounceGeneration() throws Exception {
         File pom = new File(getBasedir(), "/src/test/unit/plugin-config.xml");
         AnnouncementMojo mojo = lookupMojo("announcement-generate", pom);
diff --git a/src/test/java/org/apache/maven/plugins/changes/github/GitHubDownloaderTest.java b/src/test/java/org/apache/maven/plugins/changes/github/GitHubDownloaderTest.java
index e8aae6ba..e6e5c589 100644
--- a/src/test/java/org/apache/maven/plugins/changes/github/GitHubDownloaderTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/github/GitHubDownloaderTest.java
@@ -34,14 +34,14 @@
 import org.apache.maven.settings.crypto.SettingsDecrypter;
 import org.apache.maven.settings.crypto.SettingsDecryptionRequest;
 import org.apache.maven.settings.crypto.SettingsDecryptionResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.kohsuke.github.GHIssue;
 import org.kohsuke.github.GHIssueState;
 import org.kohsuke.github.GHUser;
 import org.mockito.ArgumentCaptor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/src/test/java/org/apache/maven/plugins/changes/issues/IssueManagementSystemTest.java b/src/test/java/org/apache/maven/plugins/changes/issues/IssueManagementSystemTest.java
index ed2fb9b2..8be798ac 100644
--- a/src/test/java/org/apache/maven/plugins/changes/issues/IssueManagementSystemTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/issues/IssueManagementSystemTest.java
@@ -21,15 +21,18 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.TestCase;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Alan Parkinson
  * @version $Id$
  * @since 2.7
  */
-public class IssueManagementSystemTest extends TestCase {
+public class IssueManagementSystemTest {
 
     private MockIssueManagementSystem ims;
 
@@ -41,11 +44,12 @@ public String getName() {
         }
     }
 
-    @Override
-    protected void setUp() {
+    @BeforeEach
+    public void setUp() {
         ims = new MockIssueManagementSystem();
     }
 
+    @Test
     public void testApplyingValidCustomIssueTypes() {
         Map<String, String> issueTypes = new HashMap<>();
         issueTypes.put("add", "Story,Epic");
@@ -59,6 +63,7 @@ public void testApplyingValidCustomIssueTypes() {
         }
     }
 
+    @Test
     public void testApplyingInvalidCustomIssueTypes() {
         Map<String, String> issueTypes = new HashMap<>();
         issueTypes.put("new", "Story,Epic");
diff --git a/src/test/java/org/apache/maven/plugins/changes/issues/IssueTestCase.java b/src/test/java/org/apache/maven/plugins/changes/issues/IssueTestCase.java
index 71498562..011831bc 100644
--- a/src/test/java/org/apache/maven/plugins/changes/issues/IssueTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/changes/issues/IssueTestCase.java
@@ -18,7 +18,10 @@
  */
 package org.apache.maven.plugins.changes.issues;
 
-import junit.framework.TestCase;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Tests for the Issue class.
@@ -26,37 +29,43 @@
  * @author Dennis Lundberg
  * @version $Id$
  */
-public class IssueTestCase extends TestCase {
+public class IssueTestCase {
     Issue issue;
 
-    protected void setUp() {
+    @BeforeEach
+    public void setUp() {
         issue = new Issue();
     }
 
+    @Test
     public void testGetSetAssignee() {
         issue.setAssignee("assignee");
 
         assertEquals("assignee", issue.getAssignee());
     }
 
+    @Test
     public void testGetSetKey() {
         issue.setKey("key");
 
         assertEquals("key", issue.getKey());
     }
 
+    @Test
     public void testGetSetResolution() {
         issue.setResolution("resolution");
 
         assertEquals("resolution", issue.getResolution());
     }
 
+    @Test
     public void testGetSetStatus() {
         issue.setStatus("status");
 
         assertEquals("status", issue.getStatus());
     }
 
+    @Test
     public void testGetSetSummary() {
         issue.setSummary("summary");
 
diff --git a/src/test/java/org/apache/maven/plugins/changes/issues/IssueUtilsTestCase.java b/src/test/java/org/apache/maven/plugins/changes/issues/IssueUtilsTestCase.java
index 20a8e821..1d72587c 100644
--- a/src/test/java/org/apache/maven/plugins/changes/issues/IssueUtilsTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/changes/issues/IssueUtilsTestCase.java
@@ -21,8 +21,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Tests for the IssueUtils class.
@@ -31,7 +34,8 @@
  * @version $Id$
  * @since 2.4
  */
-public class IssueUtilsTestCase extends TestCase {
+public class IssueUtilsTestCase {
+    @Test
     public void testFilterIssuesWithVersionPrefix() {
         Issue issue1;
         issue1 = new Issue();
diff --git a/src/test/java/org/apache/maven/plugins/changes/jira/JiraChangesReportTest.java b/src/test/java/org/apache/maven/plugins/changes/jira/JiraChangesReportTest.java
index af9ebd47..9491f9a9 100644
--- a/src/test/java/org/apache/maven/plugins/changes/jira/JiraChangesReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/jira/JiraChangesReportTest.java
@@ -19,6 +19,9 @@
 package org.apache.maven.plugins.changes.jira;
 
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * Unit tests for {@link JiraChangesReport}.
@@ -34,6 +37,7 @@ public class JiraChangesReportTest extends AbstractMojoTestCase {
      *
      * @throws Exception If any errors occur during the test run.
      */
+    @Test
     public void testCanGenerateReportSkipped() throws Exception {
         setVariableValueToObject(mojo, "skip", Boolean.TRUE);
         assertFalse(mojo.canGenerateReport());
diff --git a/src/test/java/org/apache/maven/plugins/changes/jira/JiraHelperTestCase.java b/src/test/java/org/apache/maven/plugins/changes/jira/JiraHelperTestCase.java
index d45e75bc..c7bd8791 100644
--- a/src/test/java/org/apache/maven/plugins/changes/jira/JiraHelperTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/changes/jira/JiraHelperTestCase.java
@@ -20,7 +20,9 @@
 
 import java.util.Map;
 
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Tests for the JiraHelper class.
@@ -29,7 +31,8 @@
  * @version $Id$
  * @since 2.4
  */
-public class JiraHelperTestCase extends TestCase {
+public class JiraHelperTestCase {
+    @Test
     public void testGetJiraUrlAndProjectId() {
         Map<String, String> map;
 
@@ -48,6 +51,7 @@ public void testGetJiraUrlAndProjectId() {
         assertEquals("https://issues.apache.org/jira", map.get("url"));
     }
 
+    @Test
     public void testGetJiraUrlAndProjectName() {
         Map<String, String> map;
         map = JiraHelper.getJiraUrlAndProjectName("https://issues.apache.org/jira/browse/DOXIA/");
@@ -59,6 +63,7 @@ public void testGetJiraUrlAndProjectName() {
         assertEquals("DOXIA", map.get("project"));
     }
 
+    @Test
     public void testGetBaseUrl() {
         String expected = "http://www.jira.com";
         String actual = JiraHelper.getBaseUrl("http://www.jira.com/context/test?werewrew");
diff --git a/src/test/java/org/apache/maven/plugins/changes/jira/JiraUnicodeTestCase.java b/src/test/java/org/apache/maven/plugins/changes/jira/JiraUnicodeTestCase.java
index dfb230c8..bcbdebf4 100644
--- a/src/test/java/org/apache/maven/plugins/changes/jira/JiraUnicodeTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/changes/jira/JiraUnicodeTestCase.java
@@ -33,7 +33,10 @@
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.repository.LocalRepository;
 import org.eclipse.aether.repository.RemoteRepository;
+import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -47,6 +50,7 @@ public class JiraUnicodeTestCase extends AbstractMojoTestCase {
      */
     private static final String TEST_TURTLES = "&#x6d77;&#x9f9f;&#x4e00;&#x8def;&#x4e0b;&#x8dcc;&#x3002;";
 
+    @Test
     public void testUnicodeReport() throws Exception {
 
         File pom = new File(getBasedir(), "/src/test/unit/jira-plugin-config.xml");
diff --git a/src/test/java/org/apache/maven/plugins/changes/jira/JqlQueryBuilderTestCase.java b/src/test/java/org/apache/maven/plugins/changes/jira/JqlQueryBuilderTestCase.java
index 83f854ce..0171bfda 100644
--- a/src/test/java/org/apache/maven/plugins/changes/jira/JqlQueryBuilderTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/changes/jira/JqlQueryBuilderTestCase.java
@@ -21,8 +21,10 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 
-import junit.framework.TestCase;
 import org.apache.maven.plugin.testing.SilentLog;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Test class for {@link JqlQueryBuilder}
@@ -31,15 +33,17 @@
  * @version $Id$
  * @since 2.8
  */
-public class JqlQueryBuilderTestCase extends TestCase {
+public class JqlQueryBuilderTestCase {
     private static final String ENCODING = "UTF-8";
 
+    @Test
     public void testEmptyQuery() {
         String actual = createBuilder().build();
         String expected = "";
         assertEquals(expected, actual);
     }
 
+    @Test
     public void testSingleParameterValue() throws UnsupportedEncodingException {
         String expected = URLEncoder.encode("project = DOXIA", ENCODING);
 
@@ -47,6 +51,7 @@ public void testSingleParameterValue() throws UnsupportedEncodingException {
         assertEquals(expected, actual);
     }
 
+    @Test
     public void testFixVersion() throws UnsupportedEncodingException {
         String expected = URLEncoder.encode("fixVersion = \"1.0\"", ENCODING);
 
@@ -54,6 +59,7 @@ public void testFixVersion() throws UnsupportedEncodingException {
         assertEquals(expected, actual);
     }
 
+    @Test
     public void testFixVersionCombinedWithOtherParameters() throws UnsupportedEncodingException {
         String expected = URLEncoder.encode("project = DOXIA AND fixVersion = \"1.0\"", ENCODING);
 
@@ -61,6 +67,7 @@ public void testFixVersionCombinedWithOtherParameters() throws UnsupportedEncodi
         assertEquals(expected, actual);
     }
 
+    @Test
     public void testSingleParameterSingleValue() throws UnsupportedEncodingException {
         String expected = URLEncoder.encode("priority in (Blocker)", ENCODING);
 
@@ -71,6 +78,7 @@ public void testSingleParameterSingleValue() throws UnsupportedEncodingException
         assertEquals(expected, actual);
     }
 
+    @Test
     public void testSingleParameterMultipleValues() throws UnsupportedEncodingException {
         String expected = URLEncoder.encode("priority in (Blocker, Critical, Major)", ENCODING);
 
@@ -81,6 +89,7 @@ public void testSingleParameterMultipleValues() throws UnsupportedEncodingExcept
         assertEquals(expected, actual);
     }
 
+    @Test
     public void testMultipleParameterCombinedWithAND() throws UnsupportedEncodingException {
         String expected = URLEncoder.encode("priority in (Blocker) AND status in (Resolved)", ENCODING);
 
@@ -89,6 +98,7 @@ public void testMultipleParameterCombinedWithAND() throws UnsupportedEncodingExc
         assertEquals(expected, actual);
     }
 
+    @Test
     public void testValueWithSpacesAreQuoted() throws UnsupportedEncodingException {
         String expected = URLEncoder.encode("status in (\"In Progress\")", ENCODING);
 
@@ -96,6 +106,7 @@ public void testValueWithSpacesAreQuoted() throws UnsupportedEncodingException {
         assertEquals(expected, actual);
     }
 
+    @Test
     public void testSortSingleRowAscending() throws UnsupportedEncodingException {
         String expected = URLEncoder.encode("project = DOXIA ORDER BY key ASC", ENCODING);
 
@@ -112,6 +123,7 @@ public void testSortSingleRowAscending() throws UnsupportedEncodingException {
         assertEquals(expected, actual);
     }
 
+    @Test
     public void testSortSingleDescending() throws UnsupportedEncodingException {
         String expected = URLEncoder.encode("project = DOXIA ORDER BY key DESC", ENCODING);
 
@@ -126,6 +138,7 @@ public void testSortSingleDescending() throws UnsupportedEncodingException {
         assertEquals(expected, actual);
     }
 
+    @Test
     public void testSortMultipleColumns() throws UnsupportedEncodingException {
         String expected = URLEncoder.encode("project = DOXIA ORDER BY key ASC, assignee DESC, reporter ASC", ENCODING);
 
@@ -136,6 +149,7 @@ public void testSortMultipleColumns() throws UnsupportedEncodingException {
         assertEquals(expected, actual);
     }
 
+    @Test
     public void testOrderByIsLastElement() throws UnsupportedEncodingException {
         String expected = URLEncoder.encode("project = DOXIA ORDER BY key ASC, assignee DESC, reporter ASC", ENCODING);
 
@@ -146,6 +160,7 @@ public void testOrderByIsLastElement() throws UnsupportedEncodingException {
         assertEquals(expected, actual);
     }
 
+    @Test
     public void testQuoteReservedWord() throws UnsupportedEncodingException {
         String expected =
                 URLEncoder.encode("project = \"EXEC\" ORDER BY key ASC, assignee DESC, reporter ASC", ENCODING);
diff --git a/src/test/java/org/apache/maven/plugins/changes/jira/UrlBuilderTestCase.java b/src/test/java/org/apache/maven/plugins/changes/jira/UrlBuilderTestCase.java
index bf9d412e..cf3cd94b 100644
--- a/src/test/java/org/apache/maven/plugins/changes/jira/UrlBuilderTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/changes/jira/UrlBuilderTestCase.java
@@ -18,7 +18,9 @@
  */
 package org.apache.maven.plugins.changes.jira;
 
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Test class for {@link UrlBuilder}
@@ -27,13 +29,15 @@
  * @version $Id$
  * @since 2.8
  */
-public class UrlBuilderTestCase extends TestCase {
+public class UrlBuilderTestCase {
+    @Test
     public void testUrlWithoutParameters() {
         String expected = "http://www.jira.com/context";
         String actual = new UrlBuilder("http://www.jira.com", "context").build();
         assertEquals(expected, actual);
     }
 
+    @Test
     public void testUrlWithSingleParameter() {
         String expected = "http://www.jira.com/context?key1=value1";
         String actual = new UrlBuilder("http://www.jira.com", "context")
@@ -42,6 +46,7 @@ public void testUrlWithSingleParameter() {
         assertEquals(expected, actual);
     }
 
+    @Test
     public void testUrlWithMultipleParameters() {
         String expected = "http://www.jira.com/context?key1=value1&key2=value2";
         String actual = new UrlBuilder("http://www.jira.com", "context")
@@ -51,6 +56,7 @@ public void testUrlWithMultipleParameters() {
         assertEquals(expected, actual);
     }
 
+    @Test
     public void testUrlWithIntParameter() {
         String expected = "http://www.jira.com/context?key1=1";
         String actual = new UrlBuilder("http://www.jira.com", "context")