diff --git a/commons-jcs3-core/pom.xml b/commons-jcs3-core/pom.xml
index 52e3a30e7..ea6ab9820 100644
--- a/commons-jcs3-core/pom.xml
+++ b/commons-jcs3-core/pom.xml
@@ -95,11 +95,6 @@
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
 
     <!-- Exclude for now -->
     <!-- dependency>
@@ -171,7 +166,7 @@
                 <java.security.manager>true</java.security.manager>
                 <java.security.policy>${basedir}/src/test/conf/cache.policy</java.security.policy>
                 <java.util.logging.config.file>${basedir}/src/test/test-conf/logging.properties</java.util.logging.config.file>
-              </systemPropertyVariables>              
+              </systemPropertyVariables>
             </configuration>
           </execution>
         </executions>
@@ -189,7 +184,7 @@
       </plugin>
     </plugins>
   </build>
-  
+
   <profiles>
     <profile>
       <id>testWithLog4j2</id>
@@ -216,7 +211,7 @@
                   <systemPropertyVariables>
                     <jcs.logSystem>log4j2</jcs.logSystem>
                     <log4j.configurationFile>src/test/test-conf/log4j2-test.xml</log4j.configurationFile>
-                  </systemPropertyVariables>              
+                  </systemPropertyVariables>
                 </configuration>
               </execution>
             </executions>
@@ -249,7 +244,7 @@
                     <java.security.manager>true</java.security.manager>
                     <java.security.policy>${basedir}/src/test/conf/cache.policy</java.security.policy>
                     <java.util.logging.config.file>${basedir}/src/test/test-conf/logging.properties</java.util.logging.config.file>
-                  </systemPropertyVariables>              
+                  </systemPropertyVariables>
                 </configuration>
               </execution>
             </executions>
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/ConcurrentRemovalLoadTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/ConcurrentRemovalLoadTest.java
index 6a4011783..c81c81832 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/ConcurrentRemovalLoadTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/ConcurrentRemovalLoadTest.java
@@ -1,9 +1,5 @@
 package org.apache.commons.jcs3;
 
-import junit.extensions.ActiveTestSuite;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -23,115 +19,78 @@
  * under the License.
  */
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
 /**
  * Test which exercises the hierarchical removal when the cache is active.
  */
-public class ConcurrentRemovalLoadTest
+@Execution(ExecutionMode.CONCURRENT)
+class ConcurrentRemovalLoadTest
 {
-    /**
-     * A unit test suite for JUnit. This verifies that we can remove hierarchically while the region
-     * is active.
-     * @return The test suite
-     */
-    public static Test suite()
-    {
-        final ActiveTestSuite suite = new ActiveTestSuite();
 
-        suite.addTest(new TestCase("testRemoveCache1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                RemovalTestUtil.runTestPutThenRemoveCategorical( 0, 200 );
-            }
-        });
+    @BeforeEach
+    void setUp()
+    {
+        JCS.setConfigFilename( "/TestRemoval.ccf" );
+    }
 
-        suite.addTest(new TestCase("testPutCache1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                RemovalTestUtil.runPutInRange( 300, 400 );
-            }
-        });
+    @Test
+    void testRemoveCache1_FirstRange()
+        throws Exception
+    {
+        RemovalTestUtil.runTestPutThenRemoveCategorical( 0, 200 );
+    }
 
-        suite.addTest(new TestCase("testPutCache2" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                RemovalTestUtil.runPutInRange( 401, 600 );
-            }
-        });
+    @Test
+    void testPutCache1()
+        throws Exception
+    {
+        RemovalTestUtil.runPutInRange( 300, 400 );
+    }
 
-        // stomp on previous put
-        suite.addTest(new TestCase("testPutCache3" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                RemovalTestUtil.runPutInRange( 401, 600 );
-            }
-        });
+    @Test
+    void testPutCache2_FirstRange()
+        throws Exception
+    {
+        RemovalTestUtil.runPutInRange( 401, 600 );
+    }
 
-        suite.addTest(new TestCase("testRemoveCache1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                RemovalTestUtil.runTestPutThenRemoveCategorical( 601, 700 );
-            }
-        });
+    @Test
+    void testPutCache3_StompPreviousPut()
+        throws Exception
+    {
+        RemovalTestUtil.runPutInRange( 401, 600 );
+    }
 
-        suite.addTest(new TestCase("testRemoveCache1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                RemovalTestUtil.runTestPutThenRemoveCategorical( 701, 800 );
-            }
-        });
+    @Test
+    void testRemoveCache1_SecondRange()
+        throws Exception
+    {
+        RemovalTestUtil.runTestPutThenRemoveCategorical( 601, 700 );
+    }
 
-        suite.addTest(new TestCase("testRemoveCache1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                RemovalTestUtil.runTestPutThenRemoveCategorical( 901, 1000 );
-            }
-        });
+    @Test
+    void testRemoveCache1_ThirdRange()
+        throws Exception
+    {
+        RemovalTestUtil.runTestPutThenRemoveCategorical( 701, 800 );
+    }
 
-        suite.addTest(new TestCase("testPutCache2" )
-        {
-            // verify that there are no errors with concurrent gets.
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                RemovalTestUtil.runGetInRange( 0, 1000, false );
-            }
-        });
-        return suite;
+    @Test
+    void testRemoveCache1_FourthRange()
+        throws Exception
+    {
+        RemovalTestUtil.runTestPutThenRemoveCategorical( 901, 1000 );
     }
 
-    /**
-     * Test setup
-     * <p>
-     * @throws Exception
-     */
-    @Before
-    public void setUp()
+    @Test
+    void testPutCache2_WithConcurrentGets()
         throws Exception
     {
-        JCS.setConfigFilename( "/TestRemoval.ccf" );
+        // verify that there are no errors with concurrent gets
+        RemovalTestUtil.runGetInRange( 0, 1000, false );
     }
-}
+}
\ No newline at end of file
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSCacheElementRetrievalUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSCacheElementRetrievalUnitTest.java
index 4c6c3e99f..57effa2a0 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSCacheElementRetrievalUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSCacheElementRetrievalUnitTest.java
@@ -19,23 +19,23 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  */
-public class JCSCacheElementRetrievalUnitTest
+class JCSCacheElementRetrievalUnitTest
 {
     /**
      *
      * @throws Exception
      */
     @Test
-    public void testSimpleElementRetrieval()
+    void testSimpleElementRetrieval()
         throws Exception
     {
         final CacheAccess<String, String> jcs = JCS.getInstance( "testCache1" );
@@ -44,10 +44,10 @@ public void testSimpleElementRetrieval()
 
         final long now = System.currentTimeMillis();
         final ICacheElement<String, String> elem = jcs.getCacheElement( "test_key" );
-        assertEquals( "Name wasn't right", "testCache1", elem.getCacheName() );
+        assertEquals( "testCache1", elem.getCacheName(), "Name wasn't right" );
 
         final long diff = now - elem.getElementAttributes().getCreateTime();
-        assertTrue( "Create time should have been at or after the call", diff >= 0 );
+        assertTrue( diff >= 0, "Create time should have been at or after the call" );
 
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSConcurrentCacheAccessUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSConcurrentCacheAccessUnitTest.java
index 8fd524e9e..3a3eba329 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSConcurrentCacheAccessUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSConcurrentCacheAccessUnitTest.java
@@ -1,7 +1,5 @@
 package org.apache.commons.jcs3;
 
-import static org.junit.Assert.assertEquals;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,20 +19,23 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.commons.jcs3.access.GroupCacheAccess;
 import org.apache.commons.jcs3.access.exception.CacheException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test Case for JCS-73, modeled after the Groovy code by Alexander Kleymenov
  */
-public class JCSConcurrentCacheAccessUnitTest{
+class JCSConcurrentCacheAccessUnitTest
+{
     /**
      * Worker thread
      */
@@ -131,8 +132,9 @@ public void run()
      */
     protected List<String> valueMismatchList;
 
-    @Before
-    public void setUp() throws Exception
+    @BeforeEach
+    void setUp()
+        throws Exception
 	{
         JCS.setConfigFilename( "/TestJCS-73.ccf" );
         cache = JCS.getGroupCacheInstance( "cache" );
@@ -140,20 +142,20 @@ public void setUp() throws Exception
         valueMismatchList = new CopyOnWriteArrayList<>();
 	}
 
-    @After
-    public void tearDown()
+    @AfterEach
+    void tearDown()
         throws Exception
     {
         cache.clear();
         cache.dispose();
     }
 
-	/**
+    /**
      *
      * @throws Exception
      */
     @Test
-    public void testConcurrentAccess()
+    void testConcurrentAccess()
         throws Exception
     {
     	final Worker[] worker = new Worker[THREADS];
@@ -169,12 +171,12 @@ public void testConcurrentAccess()
         	worker[i].join();
         }
 
-        assertEquals("Error count should be 0",  0, errcount.intValue());
+        assertEquals( 0, errcount.intValue(), "Error count should be 0" );
         for (final String msg : valueMismatchList)
         {
             System.out.println(msg);
         }
-        assertEquals("Value mismatch count should be 0",  0, valueMismatchList.size());
+        assertEquals( 0, valueMismatchList.size(), "Value mismatch count should be 0" );
     }
 
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSLightLoadUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSLightLoadUnitTest.java
index a28785824..0fcc777ba 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSLightLoadUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSLightLoadUnitTest.java
@@ -1,8 +1,5 @@
 package org.apache.commons.jcs3;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,14 +19,17 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 import org.apache.commons.jcs3.access.CacheAccess;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Runs a few thousand queries.
  */
-public class JCSLightLoadUnitTest
+class JCSLightLoadUnitTest
 {
     /** Number to use for the test */
     private static final int items = 20000;
@@ -38,8 +38,8 @@ public class JCSLightLoadUnitTest
      * Test setup
      * @throws Exception
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
         throws Exception
     {
         JCS.setConfigFilename( "/TestSimpleLoad.ccf" );
@@ -50,7 +50,7 @@ public void setUp()
      * @throws Exception Description of the Exception
      */
     @Test
-    public void testSimpleLoad()
+    void testSimpleLoad()
         throws Exception
     {
         final CacheAccess<String, String> jcs = JCS.getInstance( "testCache1" );
@@ -63,7 +63,7 @@ public void testSimpleLoad()
         for ( int i = items-1; i > 0; i-- )
         {
             final String res = jcs.get( i + ":key" );
-            assertNotNull( "[" + i + ":key] should not be null", res );
+            assertNotNull( res, "[" + i + ":key] should not be null" );
         }
 
         // test removal
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSRemovalSimpleConcurrentTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSRemovalSimpleConcurrentTest.java
index e4618b56e..6488e73d5 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSRemovalSimpleConcurrentTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSRemovalSimpleConcurrentTest.java
@@ -1,8 +1,5 @@
 package org.apache.commons.jcs3;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,14 +19,17 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 import org.apache.commons.jcs3.access.CacheAccess;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Verify that basic removal functionality works.
  */
-public class JCSRemovalSimpleConcurrentTest
+class JCSRemovalSimpleConcurrentTest
 {
     private CacheAccess<String, String> jcs;
 
@@ -38,8 +38,8 @@ public class JCSRemovalSimpleConcurrentTest
      * <p>
      * @throws Exception
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
         throws Exception
     {
         JCS.setConfigFilename( "/TestRemoval.ccf" );
@@ -52,7 +52,7 @@ public void setUp()
      * @throws Exception
      */
     @Test
-    public void testClear()
+    void testClear()
         throws Exception
     {
 
@@ -66,7 +66,7 @@ public void testClear()
         for ( int i = count; i >= 0; i-- )
         {
             final String res = jcs.get( i + ":key" );
-            assertNotNull( "[" + i + ":key] should not be null", res );
+            assertNotNull( res, "[" + i + ":key] should not be null" );
         }
         jcs.clear();
 
@@ -75,7 +75,7 @@ public void testClear()
             final String res = jcs.get( i + ":key" );
             if ( res != null )
             {
-                assertNull( "[" + i + ":key] should be null after remvoeall" + jcs.getStats(), res );
+                assertNull( res, "[" + i + ":key] should be null after remvoeall" + jcs.getStats() );
             }
         }
     }
@@ -86,7 +86,7 @@ public void testClear()
      * @throws Exception
      */
     @Test
-    public void testClearRepeatedlyWithoutError()
+    void testClearRepeatedlyWithoutError()
         throws Exception
     {
         final int count = 500;
@@ -101,7 +101,7 @@ public void testClearRepeatedlyWithoutError()
         for ( int i = count; i >= 0; i-- )
         {
             final String res = jcs.get( i + ":key" );
-            assertNotNull( "[" + i + ":key] should not be null", res );
+            assertNotNull( res, "[" + i + ":key] should not be null" );
         }
 
         for ( int i = count; i >= 0; i-- )
@@ -111,7 +111,7 @@ public void testClearRepeatedlyWithoutError()
             final String res = jcs.get( i + ":key" );
             if ( res != null )
             {
-                assertNull( "[" + i + ":key] should be null after remvoeall" + jcs.getStats(), res );
+                assertNull( res, "[" + i + ":key] should be null after remvoeall" + jcs.getStats() );
             }
         }
     }
@@ -122,7 +122,7 @@ public void testClearRepeatedlyWithoutError()
      * @throws Exception
      */
     @Test
-    public void testSingleDepthRemoval()
+    void testSingleDepthRemoval()
         throws Exception
     {
 
@@ -136,7 +136,7 @@ public void testSingleDepthRemoval()
         for ( int i = count; i >= 0; i-- )
         {
             final String res = jcs.get( i + ":key" );
-            assertNotNull( "[" + i + ":key] should not be null", res );
+            assertNotNull( res, "[" + i + ":key] should not be null" );
         }
 
         for ( int i = 0; i < count; i++ )
@@ -152,7 +152,7 @@ public void testSingleDepthRemoval()
      * @throws Exception
      */
     @Test
-    public void testTwoDeepRemoval()
+    void testTwoDeepRemoval()
         throws Exception
     {
         final int count = 500;
@@ -165,13 +165,13 @@ public void testTwoDeepRemoval()
         for ( int i = count; i >= 0; i-- )
         {
             final String res = jcs.get( "key:" + i + ":anotherpart" );
-            assertNotNull( "[key:" + i + ":anotherpart] should not be null, " + jcs.getStats(), res );
+            assertNotNull( res, "[key:" + i + ":anotherpart] should not be null, " + jcs.getStats() );
         }
 
         for ( int i = 0; i < count; i++ )
         {
             jcs.remove( "key:" + i + ":" );
-            assertNull( jcs.getStats(), jcs.get( "key:" + i + ":anotherpart" ) );
+            assertNull( jcs.get( "key:" + i + ":anotherpart" ), jcs.getStats() );
         }
 
     }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSThrashTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSThrashTest.java
index dc2ded259..f4ed35b86 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSThrashTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSThrashTest.java
@@ -1,10 +1,5 @@
 package org.apache.commons.jcs3;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -24,6 +19,11 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -33,16 +33,16 @@
 import org.apache.commons.jcs3.engine.stats.behavior.IStats;
 import org.apache.commons.jcs3.log.Log;
 import org.apache.commons.jcs3.log.LogManager;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * This is based on a test that was posted to the user's list:
  * <p>
  * http://www.opensubscriber.com/message/jcs-users@jakarta.apache.org/2435965.html
  */
-public class JCSThrashTest
+class JCSThrashTest
 {
     /**
      * A runnable, that can throw an exception.
@@ -164,8 +164,8 @@ public void run()
      * Sets up the test
      * @throws Exception
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
         throws Exception
     {
         JCS.setConfigFilename( "/TestThrash.ccf" );
@@ -175,8 +175,8 @@ public void setUp()
     /**
      * @throws Exception
      */
-    @After
-    public void tearDown()
+    @AfterEach
+    void tearDown()
         throws Exception
     {
         jcs.clear();
@@ -189,7 +189,7 @@ public void tearDown()
      * @throws Exception
      */
     @Test
-    public void testForMemoryLeaks()
+    void testForMemoryLeaks()
         throws Exception
     {
         final long differenceMemoryCache = thrashCache();
@@ -204,7 +204,7 @@ public void testForMemoryLeaks()
      * @throws Exception
      */
     @Test
-    public void testPut()
+    void testPut()
         throws Exception
     {
         final String value = "value";
@@ -229,7 +229,7 @@ public void testPut()
      * @throws Exception
      */
     @Test
-    public void testRemove()
+    void testRemove()
         throws Exception
     {
         jcs.put( "key1", "value1" );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSUnitTest.java
index 48acc25bd..a6659ca61 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSUnitTest.java
@@ -1,7 +1,5 @@
 package org.apache.commons.jcs3;
 
-import static org.junit.Assert.assertEquals;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,17 +19,19 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Random;
 
 import org.apache.commons.jcs3.access.CacheAccess;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Simple test for the JCS class.
  */
-public class JCSUnitTest
+class JCSUnitTest
 {
     /** A random for key generation. */
     Random random = new Random();
@@ -76,7 +76,7 @@ private HashMap<String, String> buildMap()
      * @throws Exception
      */
     @Test
-    public void testJCS()
+    void testJCS()
         throws Exception
     {
         final CacheAccess<String, LinkedList<HashMap<String, String>>> jcs = JCS.getInstance( "testCache1" );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSvsHashtablePerformanceTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSvsHashtablePerformanceTest.java
index 9c61ce8f8..ec560a19b 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSvsHashtablePerformanceTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSvsHashtablePerformanceTest.java
@@ -1,7 +1,5 @@
 package org.apache.commons.jcs3;
 
-import static org.junit.Assert.assertTrue;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,13 +19,15 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.util.Hashtable;
 
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.engine.memory.lru.LRUMemoryCache;
 import org.apache.commons.jcs3.log.Log;
 import org.apache.commons.jcs3.log.LogManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * This test ensures that basic memory operations are with a specified order of magnitude of the
@@ -158,7 +158,7 @@ public void doWork()
      * @throws Exception Description of the Exception
      */
     @Test
-    public void testSimpleLoad()
+    void testSimpleLoad()
         throws Exception
     {
         final Log log1 = LogManager.getLog( LRUMemoryCache.class );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/RemovalTestUtil.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/RemovalTestUtil.java
index 181ff58fb..368815c88 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/RemovalTestUtil.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/RemovalTestUtil.java
@@ -19,8 +19,8 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.apache.commons.jcs3.access.CacheAccess;
 
@@ -51,7 +51,7 @@ public static void runGetInRange( final int start, final int end, final boolean
             final String res = jcs.get( i + ":key" );
             if ( check )
             {
-                assertNotNull( "[" + i + ":key] should not be null", res );
+                assertNotNull( res, "[" + i + ":key] should not be null" );
             }
         }
     }
@@ -79,7 +79,7 @@ public static void runPutInRange( final int start, final int end )
         for ( int i = end; i >= start; i-- )
         {
             final String res = jcs.get( i + ":key" );
-            assertNotNull( "[" + i + ":key] should not be null", res );
+            assertNotNull( res, "[" + i + ":key] should not be null" );
         }
     }
 
@@ -106,7 +106,7 @@ public static void runTestPutThenRemoveCategorical( final int start, final int e
         for ( int i = end; i >= start; i-- )
         {
             final String res = jcs.get( i + ":key" );
-            assertNotNull( "[" + i + ":key] should not be null", res );
+            assertNotNull( res, "[" + i + ":key] should not be null" );
         }
 
         for ( int i = start; i < end; i++ )
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/TestTCPLateralCache.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/TestTCPLateralCache.java
index 97e38c9c0..b6ef1654f 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/TestTCPLateralCache.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/TestTCPLateralCache.java
@@ -1,8 +1,5 @@
 package org.apache.commons.jcs3;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,12 +19,10 @@
  * under the License.
  */
 
-import junit.extensions.ActiveTestSuite;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
 import org.apache.commons.jcs3.access.CacheAccess;
-import org.junit.Before;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test which exercises the indexed disk cache. This one uses three different
@@ -35,6 +30,7 @@
  */
 public class TestTCPLateralCache
 {
+
     /**
      * Number of items to cache, twice the configured maxObjects for the memory
      * cache regions.
@@ -57,80 +53,61 @@ public static void runTestForRegion( final String region )
         final CacheAccess<String, String> jcs = JCS.getInstance( region );
 
         // Add items to cache
-
         for ( int i = 0; i < items; i++ )
         {
             jcs.put( i + ":key", region + " data " + i );
         }
 
         // Test that all items are in cache
-
         for ( int i = 0; i < items; i++ )
         {
             final String value = jcs.get( i + ":key" );
-
-            assertEquals( region + " data " + i, value );
+            Assertions.assertEquals( region + " data " + i, value,
+                                     "Cache did not return expected value for key: " + i + ":key" );
         }
 
         // Remove all the items
-
         for ( int i = 0; i < items; i++ )
         {
             jcs.remove( i + ":key" );
         }
 
         // Verify removal
-
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key", jcs.get( i + ":key" ) );
+            Assertions.assertNull( jcs.get( i + ":key" ), "Removed key should be null: " + i + ":key" );
         }
     }
 
     /**
-     * A unit test suite for JUnit
-     *
-     * @return The test suite
+     * Test setup
      */
-    public static Test suite()
+    @BeforeEach
+    void setUp()
     {
-        final ActiveTestSuite suite = new ActiveTestSuite();
-
-        suite.addTest(new TestCase("testTcpRegion1_no_receiver" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "testTcpRegion1" );
-            }
-        });
-
-        //        suite.addTest(new TestCase("testIndexedDiskCache2" )
-        //        {
-        //            public void runTest() throws Exception
-        //            {
-        //                runTestForRegion( "indexedRegion2" );
-        //            }
-        //        });
-        //
-        //        suite.addTest(new TestCase("testIndexedDiskCache3" )
-        //        {
-        //            public void runTest() throws Exception
-        //            {
-        //                runTestForRegion( "indexedRegion3" );
-        //            }
-        //        });
-
-        return suite;
+        JCS.setConfigFilename( "/TestTCPLateralCache.ccf" );
     }
 
     /**
-     * Test setup
+     * Test for TCP region without a receiver.
      */
-    @Before
-    public void setUp()
+    @Test
+    void testTcpRegion1_noReceiver()
+        throws Exception
     {
-        JCS.setConfigFilename( "/TestTCPLateralCache.ccf" );
+        runTestForRegion( "testTcpRegion1" );
+    }
+
+    // Uncomment the following tests if more regions are needed.
+    /*
+    @Test
+    void testIndexedDiskCache2() throws Exception {
+        runTestForRegion("indexedRegion2");
+    }
+
+    @Test
+    void testIndexedDiskCache3() throws Exception {
+        runTestForRegion("indexedRegion3");
     }
+    */
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/ZeroSizeCacheUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/ZeroSizeCacheUnitTest.java
index 5d7de1fd5..c1a5bf47d 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/ZeroSizeCacheUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/ZeroSizeCacheUnitTest.java
@@ -19,15 +19,15 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.apache.commons.jcs3.access.CacheAccess;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
-public class ZeroSizeCacheUnitTest
+class ZeroSizeCacheUnitTest
 {
     /** Number to get each loop */
     private static final int items = 20000;
@@ -37,8 +37,8 @@ public class ZeroSizeCacheUnitTest
      * <p>
      * @throws Exception
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
         throws Exception
     {
         JCS.setConfigFilename( "/TestZeroSizeCache.ccf" );
@@ -50,7 +50,7 @@ public void setUp()
      * @throws Exception
      */
     @Test
-    public void testPutGetRemove()
+    void testPutGetRemove()
         throws Exception
     {
         final CacheAccess<String, String> jcs = JCS.getInstance( "testCache1" );
@@ -64,7 +64,7 @@ public void testPutGetRemove()
         for ( int i = items; i >= 0; i-- )
         {
             final String res = jcs.get( i + ":key" );
-            assertNull( "[" + i + ":key] should be null", res );
+            assertNull( res, "[" + i + ":key] should be null" );
         }
 
         // test removal, should be no exceptions
@@ -82,7 +82,7 @@ public void testPutGetRemove()
         for ( int i = items; i >= 0; i-- )
         {
             final String res = jcs.get( i + ":key" );
-            assertNull( "[" + i + ":key] should be null", res );
+            assertNull( res, "[" + i + ":key] should be null" );
         }
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/CacheAccessUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/CacheAccessUnitTest.java
index be1d2d890..0da331549 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/CacheAccessUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/CacheAccessUnitTest.java
@@ -1,12 +1,5 @@
 package org.apache.commons.jcs3.access;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -26,6 +19,14 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -38,24 +39,24 @@
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
 import org.apache.commons.jcs3.engine.behavior.ICompositeCacheAttributes;
 import org.apache.commons.jcs3.engine.behavior.IElementAttributes;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the methods of the cache access class.
  */
-public class CacheAccessUnitTest
+class CacheAccessUnitTest
 {
     /**
      * Verify that getCacheElements returns the elements requested based on the key.
      * @throws Exception
      */
     @Test
-    public void testGetCacheElements()
+    void testGetCacheElements()
         throws Exception
     {
         //SETUP
         final CacheAccess<String, String> access = JCS.getInstance( "test" );
-        assertNotNull( "We should have an access class", access );
+        assertNotNull( access, "We should have an access class" );
 
         final String keyOne = "mykeyone";
         final String keyTwo = "mykeytwo";
@@ -78,21 +79,21 @@ public void testGetCacheElements()
         final Map<String, ICacheElement<String, String>> result = access.getCacheElements( input );
 
         //VERIFY
-        assertEquals( "map size", 2, result.size() );
+        assertEquals( 2, result.size(), "map size" );
         final ICacheElement<String, String> elementOne = result.get( keyOne );
-        assertEquals( "value one", keyOne, elementOne.getKey() );
-        assertEquals( "value one", valueOne, elementOne.getVal() );
+        assertEquals( keyOne, elementOne.getKey(), "value one" );
+        assertEquals( valueOne, elementOne.getVal(), "value one" );
         final ICacheElement<String, String> elementTwo = result.get( keyTwo );
-        assertEquals( "value two", keyTwo, elementTwo.getKey() );
-        assertEquals( "value two", valueTwo, elementTwo.getVal() );
+        assertEquals( keyTwo, elementTwo.getKey(), "value two" );
+        assertEquals( valueTwo, elementTwo.getVal(), "value two" );
 
         assertNull(access.get(keyFour));
         final String suppliedValue1 = access.get(keyFour, () -> valueFour);
-        assertNotNull( "value four", suppliedValue1);
-        assertEquals( "value four", valueFour, suppliedValue1);
+        assertNotNull( suppliedValue1, "value four" );
+        assertEquals( valueFour, suppliedValue1, "value four" );
         final String suppliedValue2 = access.get(keyFour);
-        assertNotNull( "value four", suppliedValue2);
-        assertEquals( "value four", suppliedValue1, suppliedValue2);
+        assertNotNull( suppliedValue2, "value four" );
+        assertEquals( suppliedValue1, suppliedValue2, "value four" );
     }
 
     /**
@@ -101,7 +102,7 @@ public void testGetCacheElements()
      * @throws Exception
      */
     @Test
-    public void testGetMatching_Normal()
+    void testGetMatching_Normal()
         throws Exception
     {
         // SETUP
@@ -138,15 +139,15 @@ public void testGetMatching_Normal()
         final Map<String, Integer> result2 = access.getMatching( keyprefix2 + "\\S+" );
 
         // VERIFY
-        assertEquals( "Wrong number returned 1:", numToInsertPrefix1, result1.size() );
-        assertEquals( "Wrong number returned 2:", numToInsertPrefix2, result2.size() );
+        assertEquals( numToInsertPrefix1, result1.size(), "Wrong number returned 1:" );
+        assertEquals( numToInsertPrefix2, result2.size(), "Wrong number returned 2:" );
         //System.out.println( result1 );
 
         // verify that the elements are unwrapped
         for (final Map.Entry<String, Integer> entry : result1.entrySet())
         {
             final Object value = entry.getValue();
-            assertFalse( "Should not be a cache element.", value instanceof ICacheElement );
+            assertFalse( value instanceof ICacheElement, "Should not be a cache element." );
         }
     }
 
@@ -156,7 +157,7 @@ public void testGetMatching_Normal()
      * @throws Exception
      */
     @Test
-    public void testGetMatchingElements_Normal()
+    void testGetMatchingElements_Normal()
         throws Exception
     {
         // SETUP
@@ -193,15 +194,15 @@ public void testGetMatchingElements_Normal()
         final Map<String, ICacheElement<String, Integer>> result2 = access.getMatchingCacheElements( keyprefix2 + ".+" );
 
         // VERIFY
-        assertEquals( "Wrong number returned 1:", numToInsertPrefix1, result1.size() );
-        assertEquals( "Wrong number returned 2:", numToInsertPrefix2, result2.size() );
+        assertEquals( numToInsertPrefix1, result1.size(), "Wrong number returned 1:" );
+        assertEquals( numToInsertPrefix2, result2.size(), "Wrong number returned 2:" );
         //System.out.println( result1 );
 
         // verify that the elements are wrapped
         for (final Map.Entry<String, ICacheElement<String, Integer>> entry : result1.entrySet())
         {
             final Object value = entry.getValue();
-            assertTrue( "Should be a cache element.", value instanceof ICacheElement );
+            assertInstanceOf( ICacheElement.class, value, "Should be a cache element." );
         }
     }
 
@@ -210,11 +211,11 @@ public void testGetMatchingElements_Normal()
      * @throws Exception
      */
     @Test
-    public void testPutNullKey()
+    void testPutNullKey()
         throws Exception
     {
         final CacheAccess<String, String> access = JCS.getInstance( "test" );
-        assertNotNull( "We should have an access class", access );
+        assertNotNull( access, "We should have an access class" );
 
         final String key = null;
         final String value = "myvalue";
@@ -226,7 +227,7 @@ public void testPutNullKey()
         }
         catch ( final CacheException e )
         {
-            assertTrue( "Should have the word null in the error message.", e.getMessage().indexOf( "null" ) != -1 );
+            assertTrue( e.getMessage().indexOf( "null" ) != -1, "Should have the word null in the error message." );
         }
     }
 
@@ -235,11 +236,11 @@ public void testPutNullKey()
      * @throws Exception
      */
     @Test
-    public void testPutNullValue()
+    void testPutNullValue()
         throws Exception
     {
         final CacheAccess<String, String> access = JCS.getInstance( "test" );
-        assertNotNull( "We should have an access class", access );
+        assertNotNull( access, "We should have an access class" );
 
         final String key = "myKey";
         final String value = null;
@@ -251,7 +252,7 @@ public void testPutNullValue()
         }
         catch ( final CacheException e )
         {
-            assertTrue( "Should have the word null in the error message.", e.getMessage().indexOf( "null" ) != -1 );
+            assertTrue( e.getMessage().indexOf( "null" ) != -1, "Should have the word null in the error message." );
         }
     }
 
@@ -260,11 +261,11 @@ public void testPutNullValue()
      * @throws Exception
      */
     @Test
-    public void testPutSafe()
+    void testPutSafe()
         throws Exception
     {
         final CacheAccess<String, String> access = JCS.getInstance( "test" );
-        assertNotNull( "We should have an access class", access );
+        assertNotNull( access, "We should have an access class" );
 
         final String key = "mykey";
         final String value = "myvalue";
@@ -272,7 +273,7 @@ public void testPutSafe()
         access.put( key, value );
 
         final String returnedValue1 = access.get( key );
-        assertEquals( "Wrong value returned.", value, returnedValue1 );
+        assertEquals( value, returnedValue1, "Wrong value returned." );
 
         try
         {
@@ -281,12 +282,12 @@ public void testPutSafe()
         }
         catch ( final CacheException e )
         {
-            assertTrue( "Wrong type of exception.", e instanceof ObjectExistsException );
-            assertTrue( "Should have the key in the error message.", e.getMessage().indexOf( "[" + key + "]" ) != -1 );
+            assertInstanceOf( ObjectExistsException.class, e, "Wrong type of exception." );
+            assertTrue( e.getMessage().indexOf( "[" + key + "]" ) != -1, "Should have the key in the error message." );
         }
 
         final String returnedValue2 = access.get( key );
-        assertEquals( "Wrong value returned.  Should still be the original.", value, returnedValue2 );
+        assertEquals( value, returnedValue2, "Wrong value returned.  Should still be the original." );
     }
 
     /**
@@ -294,11 +295,11 @@ public void testPutSafe()
      * @throws Exception
      */
     @Test
-    public void testRegionDefiniton()
+    void testRegionDefiniton()
         throws Exception
     {
         final CacheAccess<String, String> access = JCS.getInstance( "test" );
-        assertNotNull( "We should have an access class", access );
+        assertNotNull( access, "We should have an access class" );
     }
 
     /**
@@ -306,7 +307,7 @@ public void testRegionDefiniton()
      * @throws Exception
      */
     @Test
-    public void testRegionDefinitonWithAttributes()
+    void testRegionDefinitonWithAttributes()
         throws Exception
     {
         final ICompositeCacheAttributes ca = new CompositeCacheAttributes();
@@ -315,10 +316,10 @@ public void testRegionDefinitonWithAttributes()
         ca.setMaxMemoryIdleTimeSeconds( maxIdleTime );
 
         final CacheAccess<String, String> access = JCS.getInstance( "testRegionDefinitonWithAttributes", ca );
-        assertNotNull( "We should have an access class", access );
+        assertNotNull( access, "We should have an access class" );
 
         final ICompositeCacheAttributes ca2 = access.getCacheAttributes();
-        assertEquals( "Wrong idle time setting.", ca.getMaxMemoryIdleTimeSeconds(), ca2.getMaxMemoryIdleTimeSeconds() );
+        assertEquals( ca.getMaxMemoryIdleTimeSeconds(), ca2.getMaxMemoryIdleTimeSeconds(), "Wrong idle time setting." );
     }
 
     /**
@@ -327,7 +328,7 @@ public void testRegionDefinitonWithAttributes()
      * @throws Exception
      */
     @Test
-    public void testRegionDefinitonWithBothAttributes()
+    void testRegionDefinitonWithBothAttributes()
         throws Exception
     {
         final ICompositeCacheAttributes ca = new CompositeCacheAttributes();
@@ -340,10 +341,10 @@ public void testRegionDefinitonWithBothAttributes()
         attr.setMaxLife(maxLife);
 
         final CacheAccess<String, String> access = JCS.getInstance( "testRegionDefinitonWithAttributes", ca, attr );
-        assertNotNull( "We should have an access class", access );
+        assertNotNull( access, "We should have an access class" );
 
         final ICompositeCacheAttributes ca2 = access.getCacheAttributes();
-        assertEquals( "Wrong idle time setting.", ca.getMaxMemoryIdleTimeSeconds(), ca2.getMaxMemoryIdleTimeSeconds() );
+        assertEquals( ca.getMaxMemoryIdleTimeSeconds(), ca2.getMaxMemoryIdleTimeSeconds(), "Wrong idle time setting." );
     }
 
     /**
@@ -351,11 +352,11 @@ public void testRegionDefinitonWithBothAttributes()
      * @throws Exception
      */
     @Test
-    public void testSetDefaultElementAttributes()
+    void testSetDefaultElementAttributes()
         throws Exception
     {
         final CacheAccess<String, String> access = JCS.getInstance( "test" );
-        assertNotNull( "We should have an access class", access );
+        assertNotNull( access, "We should have an access class" );
 
         final long maxLife = 9876;
         final IElementAttributes attr = new ElementAttributes();
@@ -363,8 +364,8 @@ public void testSetDefaultElementAttributes()
 
         access.setDefaultElementAttributes( attr );
 
-        assertEquals( "Wrong element attributes.", attr.getMaxLife(), access.getDefaultElementAttributes()
-            .getMaxLife() );
+        assertEquals( attr.getMaxLife(), access.getDefaultElementAttributes()
+            .getMaxLife(), "Wrong element attributes." );
 
         final String key = "mykey";
         final String value = "myvalue";
@@ -373,7 +374,7 @@ public void testSetDefaultElementAttributes()
 
         final ICacheElement<String, String> element = access.getCacheElement( key );
 
-        assertEquals( "Wrong max life.  Should have the new value.", maxLife, element.getElementAttributes()
-            .getMaxLife() );
+        assertEquals( maxLife, element.getElementAttributes()
+            .getMaxLife(), "Wrong max life.  Should have the new value." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/GroupCacheAccessUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/GroupCacheAccessUnitTest.java
index e2e3df4c8..057391b47 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/GroupCacheAccessUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/GroupCacheAccessUnitTest.java
@@ -1,11 +1,5 @@
 package org.apache.commons.jcs3.access;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -25,16 +19,22 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.util.Set;
 
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.exception.CacheException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the methods of the group cache access class.
  */
-public class GroupCacheAccessUnitTest
+class GroupCacheAccessUnitTest
 {
     /**
      * Verify we can use the group cache.
@@ -42,7 +42,7 @@ public class GroupCacheAccessUnitTest
      * @throws Exception
      */
     @Test
-    public void testGroupCache()
+    void testGroupCache()
         throws Exception
     {
         final GroupCacheAccess<String, Integer> access = JCS.getGroupCacheInstance( "testGroup" );
@@ -74,11 +74,11 @@ public void testGroupCache()
 
         keys1 = access.getGroupKeys( groupName1 ); // Test for JCS-102
         assertNotNull(keys1);
-        assertEquals("Wrong number returned 1:", 10, keys1.size());
+        assertEquals( 10, keys1.size(), "Wrong number returned 1:" );
 
         keys2 = access.getGroupKeys( groupName2 );
         assertNotNull(keys2);
-        assertEquals("Wrong number returned 2:", 50, keys2.size());
+        assertEquals( 50, keys2.size(), "Wrong number returned 2:" );
 
         assertEquals(Integer.valueOf(5), access.getFromGroup("5", groupName1));
         assertEquals(Integer.valueOf(6), access.getFromGroup("5", groupName2));
@@ -92,11 +92,11 @@ public void testGroupCache()
      * @throws Exception
      */
     @Test
-    public void testInvalidate()
+    void testInvalidate()
         throws Exception
     {
         final GroupCacheAccess<String, String> access = JCS.getGroupCacheInstance( "test" );
-        assertNotNull( "We should have an access class", access );
+        assertNotNull( access, "We should have an access class" );
 
         final String key = "mykey";
         final String group = "mygroup";
@@ -116,22 +116,22 @@ public void testInvalidate()
         for (int i = 0; i < 10; i++)
         {
             final String returnedValue1 = access.getFromGroup(key + i, group + 0);
-            assertEquals( "Wrong value returned.", value + i, returnedValue1 );
+            assertEquals( value + i, returnedValue1, "Wrong value returned." );
             final String returnedValue2 = access.getFromGroup(key + i, group + 1);
-            assertEquals( "Wrong value returned.", value + i, returnedValue2 );
+            assertEquals( value + i, returnedValue2, "Wrong value returned." );
         }
 
         access.invalidateGroup(group + 0);
 
         for (int i = 0; i < 10; i++)
         {
-            assertNull("Should not be in cache", access.getFromGroup(key + i, group + 0));
+            assertNull( access.getFromGroup( key + i, group + 0 ), "Should not be in cache" );
         }
 
         for (int i = 0; i < 10; i++)
         {
             final String returnedValue1 = access.getFromGroup(key + i, group + 1);
-            assertEquals( "Wrong value returned.", value + i, returnedValue1 );
+            assertEquals( value + i, returnedValue1, "Wrong value returned." );
         }
     }
 
@@ -140,11 +140,11 @@ public void testInvalidate()
      * @throws Exception
      */
     @Test
-    public void testPutAndGet()
+    void testPutAndGet()
         throws Exception
     {
         final GroupCacheAccess<String, String> access = JCS.getGroupCacheInstance( "test" );
-        assertNotNull( "We should have an access class", access );
+        assertNotNull( access, "We should have an access class" );
 
         final String key = "mykey";
         final String group = "mygroup";
@@ -153,7 +153,7 @@ public void testPutAndGet()
         access.putInGroup(key, group, value);
 
         final String returnedValue1 = access.getFromGroup(key, group);
-        assertEquals( "Wrong value returned.", value, returnedValue1 );
+        assertEquals( value, returnedValue1, "Wrong value returned." );
     }
 
     /**
@@ -161,11 +161,11 @@ public void testPutAndGet()
      * @throws Exception
      */
     @Test
-    public void testPutNullKey()
+    void testPutNullKey()
         throws Exception
     {
         final GroupCacheAccess<String, String> access = JCS.getGroupCacheInstance( "test" );
-        assertNotNull( "We should have an access class", access );
+        assertNotNull( access, "We should have an access class" );
 
         final String key = null;
         final String group = "mygroup";
@@ -178,7 +178,7 @@ public void testPutNullKey()
         }
         catch ( final CacheException e )
         {
-            assertTrue( "Should have the word null in the error message.", e.getMessage().indexOf( "null" ) != -1 );
+            assertTrue( e.getMessage().indexOf( "null" ) != -1, "Should have the word null in the error message." );
         }
     }
 
@@ -187,11 +187,11 @@ public void testPutNullKey()
      * @throws Exception
      */
     @Test
-    public void testPutNullValue()
+    void testPutNullValue()
         throws Exception
     {
         final GroupCacheAccess<String, String> access = JCS.getGroupCacheInstance( "test" );
-        assertNotNull( "We should have an access class", access );
+        assertNotNull( access, "We should have an access class" );
 
         final String key = "myKey";
         final String group = "mygroup";
@@ -204,7 +204,7 @@ public void testPutNullValue()
         }
         catch ( final CacheException e )
         {
-            assertTrue( "Should have the word null in the error message.", e.getMessage().indexOf( "null" ) != -1 );
+            assertTrue( e.getMessage().indexOf( "null" ) != -1, "Should have the word null in the error message." );
         }
     }
 
@@ -213,11 +213,11 @@ public void testPutNullValue()
      * @throws Exception
      */
     @Test
-    public void testRemove()
+    void testRemove()
         throws Exception
     {
         final GroupCacheAccess<String, String> access = JCS.getGroupCacheInstance( "test" );
-        assertNotNull( "We should have an access class", access );
+        assertNotNull( access, "We should have an access class" );
 
         final String key = "mykey";
         final String group = "mygroup";
@@ -232,17 +232,17 @@ public void testRemove()
         for (int i = 0; i < 10; i++)
         {
             final String returnedValue1 = access.getFromGroup(key + i, group);
-            assertEquals( "Wrong value returned.", value + i, returnedValue1 );
+            assertEquals( value + i, returnedValue1, "Wrong value returned." );
         }
 
         access.removeFromGroup(key + 0, group);
 
-        assertNull("Should not be in cache", access.getFromGroup(key + 0, group));
+        assertNull( access.getFromGroup( key + 0, group ), "Should not be in cache" );
 
         for (int i = 1; i < 10; i++)
         {
             final String returnedValue1 = access.getFromGroup(key + i, group);
-            assertEquals( "Wrong value returned.", value + i, returnedValue1 );
+            assertEquals( value + i, returnedValue1, "Wrong value returned." );
         }
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/SystemPropertyUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/SystemPropertyUnitTest.java
index d53a85e3a..ea11518ea 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/SystemPropertyUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/SystemPropertyUnitTest.java
@@ -19,68 +19,79 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.engine.control.CompositeCacheManager;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 
 /**
  * This test is for the system property usage in configuration values.
  */
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class SystemPropertyUnitTest
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+class SystemPropertyUnitTest
 {
 
+    /**
+     * Set up configuration file before each test.
+     */
+    @BeforeEach
+    void setUp()
+    {
+        JCS.setConfigFilename( "/TestSystemProperties.ccf" );
+    }
+
+    /**
+     * Clear system properties after each test to prevent interference between tests.
+     */
+    @AfterEach
+    void tearDown()
+    {
+        System.clearProperty( "MY_SYSTEM_PROPERTY_DISK_DIR" );
+        System.clearProperty( "MY_SYSTEM_PROPERTY_MAX_SIZE" );
+    }
+
     /**
      * Verify that we use a system property for a ${FOO} string in a value.
      *
      * @throws Exception
      */
     @Test
-    public void test1SystemPropertyInValueDelimiter()
+    @Order(1)
+    void testSystemPropertyInValueDelimiter()
         throws Exception
     {
-
         final int maxMemory = 1234;
-        System.getProperties().setProperty( "MY_SYSTEM_PROPERTY_DISK_DIR", "system_set" );
-        System.getProperties().setProperty( "MY_SYSTEM_PROPERTY_MAX_SIZE", String.valueOf( maxMemory ) );
-
-        JCS.setConfigFilename( "/TestSystemProperties.ccf" );
+        System.setProperty( "MY_SYSTEM_PROPERTY_DISK_DIR", "system_set" );
+        System.setProperty( "MY_SYSTEM_PROPERTY_MAX_SIZE", String.valueOf( maxMemory ) );
 
         final CacheAccess<String, String> cache = JCS.getInstance( "test1" );
-        assertEquals( "We should have used the system property for the memory size", maxMemory, cache
-            .getCacheAttributes().getMaxObjects() );
-
-        System.clearProperty("MY_SYSTEM_PROPERTY_DISK_DIR");
-        System.clearProperty("MY_SYSTEM_PROPERTY_MAX_SIZE");
+        assertEquals( maxMemory, cache.getCacheAttributes().getMaxObjects(),
+                      "We should have used the system property for the memory size" );
     }
 
     /**
-     * Verify that we use a system property for a ${FOO} string in a value. We
-     * define a propety in the cache.ccf file, but we do not have it as a system
-     * property. The default value should be used, if one exists.
+     * Verify that we use a default value when the system property is missing.
      *
      * @throws Exception
      */
     @Test
-    public void test2SystemPropertyMissingInValueDelimeter()
+    @Order(2)
+    void testSystemPropertyMissingInValueDelimiter()
         throws Exception
     {
-        System.getProperties().setProperty( "MY_SYSTEM_PROPERTY_DISK_DIR", "system_set" );
+        System.setProperty( "MY_SYSTEM_PROPERTY_DISK_DIR", "system_set" );
 
         final CompositeCacheManager mgr = CompositeCacheManager.getUnconfiguredInstance();
         mgr.configure( "/TestSystemProperties.ccf" );
 
         final CacheAccess<String, String> cache = JCS.getInstance( "missing" );
-        // TODO check against the actual default def
-        assertEquals( "We should have used the default property for the memory size", 100, cache.getCacheAttributes()
-            .getMaxObjects() );
-
-        System.clearProperty("MY_SYSTEM_PROPERTY_DISK_DIR");
-
+        assertEquals( 100, cache.getCacheAttributes().getMaxObjects(),
+                      "We should have used the default property for the memory size" );
     }
-
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/admin/AdminBeanUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/admin/AdminBeanUnitTest.java
index 0a59d1852..406c548bd 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/admin/AdminBeanUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/admin/AdminBeanUnitTest.java
@@ -1,9 +1,5 @@
 package org.apache.commons.jcs3.admin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -23,16 +19,20 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.util.List;
 
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test the admin bean that is used by the JCSAdmin.jsp
  */
-public class AdminBeanUnitTest
+class AdminBeanUnitTest
 {
 
     /**
@@ -41,7 +41,7 @@ public class AdminBeanUnitTest
      * @throws Exception
      */
     @Test
-    public void testClearAll()
+    void testClearAll()
         throws Exception
     {
         final JCSAdminBean admin = new JCSAdminBean();
@@ -55,7 +55,7 @@ public void testClearAll()
         admin.clearAllRegions();
 
         final List<CacheElementInfo> elements2 = admin.buildElementInfo( regionName );
-        assertEquals( "Wrong number of elements in the region after remove.", 0, elements2.size() );
+        assertEquals( 0, elements2.size(), "Wrong number of elements in the region after remove." );
     }
 
     /**
@@ -64,7 +64,7 @@ public void testClearAll()
      * @throws Exception
      */
     @Test
-    public void testGetElementForRegionInfo()
+    void testGetElementForRegionInfo()
         throws Exception
     {
         final String regionName = "myRegion";
@@ -79,10 +79,10 @@ public void testGetElementForRegionInfo()
         final JCSAdminBean admin = new JCSAdminBean();
 
         final List<CacheElementInfo> elements = admin.buildElementInfo( regionName );
-        assertEquals( "Wrong number of elements in the region.", 1, elements.size() );
+        assertEquals( 1, elements.size(), "Wrong number of elements in the region." );
 
         final CacheElementInfo elementInfo = elements.get(0);
-        assertEquals( "Wrong key." + elementInfo, key, elementInfo.getKey() );
+        assertEquals( key, elementInfo.getKey(), "Wrong key." + elementInfo );
     }
 
     /**
@@ -91,7 +91,7 @@ public void testGetElementForRegionInfo()
      * @throws Exception
      */
     @Test
-    public void testGetRegionInfo()
+    void testGetRegionInfo()
         throws Exception
     {
         final String regionName = "myRegion";
@@ -112,13 +112,13 @@ public void testGetRegionInfo()
             {
                 foundRegion = true;
 
-                assertTrue( "Byte count should be greater than 5.", info.getByteCount() > 5 );
+                assertTrue( info.getByteCount() > 5, "Byte count should be greater than 5." );
 
-                assertNotNull( "Should have stats.", info.getCacheStatistics() );
+                assertNotNull( info.getCacheStatistics(), "Should have stats." );
             }
         }
 
-        assertTrue( "Should have found the region we just created.", foundRegion );
+        assertTrue( foundRegion, "Should have found the region we just created." );
     }
 
     /**
@@ -127,7 +127,7 @@ public void testGetRegionInfo()
      * @throws Exception
      */
     @Test
-    public void testRemove()
+    void testRemove()
         throws Exception
     {
         final JCSAdminBean admin = new JCSAdminBean();
@@ -143,14 +143,14 @@ public void testRemove()
         cache.put( key, "value" );
 
         final List<CacheElementInfo> elements = admin.buildElementInfo( regionName );
-        assertEquals( "Wrong number of elements in the region.", 1, elements.size() );
+        assertEquals( 1, elements.size(), "Wrong number of elements in the region." );
 
         final CacheElementInfo elementInfo = elements.get(0);
-        assertEquals( "Wrong key.", key, elementInfo.getKey() );
+        assertEquals( key, elementInfo.getKey(), "Wrong key." );
 
         admin.removeItem( regionName, key );
 
         final List<CacheElementInfo> elements2 = admin.buildElementInfo( regionName );
-        assertEquals( "Wrong number of elements in the region after remove.", 0, elements2.size() );
+        assertEquals( 0, elements2.size(), "Wrong number of elements in the region after remove." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/admin/CountingStreamUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/admin/CountingStreamUnitTest.java
index 9f16384b3..baacbfb88 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/admin/CountingStreamUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/admin/CountingStreamUnitTest.java
@@ -19,14 +19,14 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the counting only output stream.
  */
-public class CountingStreamUnitTest
+class CountingStreamUnitTest
 {
 
     /**
@@ -35,12 +35,13 @@ public class CountingStreamUnitTest
      * @throws Exception
      */
     @Test
-    public void testByteArray() throws Exception
+    void testByteArray()
+        throws Exception
     {
         final CountingOnlyOutputStream out = new CountingOnlyOutputStream();
         final byte[] array = {1,2,3,4,5};
         out.write( array );
-        assertEquals( "Wrong number of bytes written.", array.length, out.getCount() );
+        assertEquals( array.length, out.getCount(), "Wrong number of bytes written." );
         out.close();
     }
 
@@ -50,13 +51,14 @@ public void testByteArray() throws Exception
      * @throws Exception
      */
     @Test
-    public void testByteArrayLenCount() throws Exception
+    void testByteArrayLenCount()
+        throws Exception
     {
         final CountingOnlyOutputStream out = new CountingOnlyOutputStream();
         final byte[] array = {1,2,3,4,5};
         final int len = 3;
         out.write( array, 0, len );
-        assertEquals( "Wrong number of bytes written.", len, out.getCount() );
+        assertEquals( len, out.getCount(), "Wrong number of bytes written." );
         out.close();
     }
 
@@ -66,13 +68,14 @@ public void testByteArrayLenCount() throws Exception
      * @throws Exception
      */
     @Test
-    public void testSingleByte() throws Exception
+    void testSingleByte()
+        throws Exception
     {
         final CountingOnlyOutputStream out = new CountingOnlyOutputStream();
         out.write( 1 );
-        assertEquals( "Wrong number of bytes written.", 1, out.getCount() );
+        assertEquals( 1, out.getCount(), "Wrong number of bytes written." );
         out.write( 1 );
-        assertEquals( "Wrong number of bytes written.", 2, out.getCount() );
+        assertEquals( 2, out.getCount(), "Wrong number of bytes written." );
         out.close();
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/AuxiliaryCacheConfiguratorUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/AuxiliaryCacheConfiguratorUnitTest.java
index ad614486c..9b7eeeed0 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/AuxiliaryCacheConfiguratorUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/AuxiliaryCacheConfiguratorUnitTest.java
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.Properties;
 
@@ -30,16 +30,16 @@
 import org.apache.commons.jcs3.engine.control.MockElementSerializer;
 import org.apache.commons.jcs3.engine.logging.MockCacheEventLogger;
 import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the auxiliary cache configurator. */
-public class AuxiliaryCacheConfiguratorUnitTest
+class AuxiliaryCacheConfiguratorUnitTest
 {
     /**
      * Verify that we can parse the event logger.
      */
     @Test
-    public void testParseCacheEventLogger_Normal()
+    void testParseCacheEventLogger_Normal()
     {
         // SETUP
         final String auxPrefix = "jcs.auxiliary." + "MYAux";
@@ -56,15 +56,15 @@ public void testParseCacheEventLogger_Normal()
             .parseCacheEventLogger( props, auxPrefix );
 
         // VERIFY
-        assertNotNull( "Should have a logger.", result );
-        assertEquals( "Property should be set.", testPropertyValue, result.getTestProperty() );
+        assertNotNull( result, "Should have a logger." );
+        assertEquals( testPropertyValue, result.getTestProperty(), "Property should be set." );
     }
 
     /**
      * Verify that we don't get an error.
      */
     @Test
-    public void testParseCacheEventLogger_Null()
+    void testParseCacheEventLogger_Null()
     {
         // SETUP
         final Properties props = new Properties();
@@ -74,14 +74,14 @@ public void testParseCacheEventLogger_Null()
                                                                                                                "junk" );
 
         // VERIFY
-        assertNull( "Should not have a logger.", result );
+        assertNull( result, "Should not have a logger." );
     }
 
     /**
      * Verify that we don't get an error.
      */
     @Test
-    public void testParseCacheEventLogger_NullName()
+    void testParseCacheEventLogger_NullName()
     {
         // SETUP
         final Properties props = new Properties();
@@ -91,14 +91,14 @@ public void testParseCacheEventLogger_NullName()
                                                                                                                null );
 
         // VERIFY
-        assertNull( "Should not have a logger.", result );
+        assertNull( result, "Should not have a logger." );
     }
 
     /**
      * Verify that we can parse the ElementSerializer.
      */
     @Test
-    public void testParseElementSerializer_Normal()
+    void testParseElementSerializer_Normal()
     {
         // SETUP
         final String auxPrefix = "jcs.auxiliary." + "MYAux";
@@ -115,15 +115,15 @@ public void testParseElementSerializer_Normal()
             .parseElementSerializer( props, auxPrefix );
 
         // VERIFY
-        assertNotNull( "Should have a Serializer.", result );
-        assertEquals( "Property should be set.", testPropertyValue, result.getTestProperty() );
+        assertNotNull( result, "Should have a Serializer." );
+        assertEquals( testPropertyValue, result.getTestProperty(), "Property should be set." );
     }
 
     /**
      * Verify that we can parse the ElementSerializer.
      */
     @Test
-    public void testParseElementSerializer_Null()
+    void testParseElementSerializer_Null()
     {
         // SETUP
         final Properties props = new Properties();
@@ -133,6 +133,6 @@ public void testParseElementSerializer_Null()
             .parseElementSerializer( props, "junk" );
 
         // VERIFY
-        assertTrue( "Should have the default Serializer.", result instanceof StandardSerializer );
+        assertInstanceOf( StandardSerializer.class, result, "Should have the default Serializer." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCacheUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCacheUnitTest.java
index 573e0397b..fc10ae396 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCacheUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCacheUnitTest.java
@@ -1,11 +1,5 @@
 package org.apache.commons.jcs3.auxiliary.disk;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -25,6 +19,12 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Collections;
@@ -42,10 +42,10 @@
 import org.apache.commons.jcs3.engine.ElementAttributes;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
 import org.apache.commons.jcs3.engine.behavior.IElementAttributes;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the abstract disk cache. It's largely tested by actual instances. */
-public class AbstractDiskCacheUnitTest
+class AbstractDiskCacheUnitTest
 {
     /** Concrete, testable instance. */
     protected static class AbstractDiskCacheTestInstance<K, V>
@@ -186,7 +186,7 @@ protected void processUpdate( final ICacheElement<K, V> cacheElement )
      * @throws IOException
      */
     @Test
-    public void testDispose()
+    void testDispose()
         throws IOException
     {
         // SETUP
@@ -207,8 +207,8 @@ public void testDispose()
         diskCache.dispose();
 
         // VERIFY
-        assertFalse( "disk cache should not be alive.", diskCache.isAlive() );
-        assertEquals( "Status should be disposed", CacheStatus.DISPOSED, diskCache.getStatus() );
+        assertFalse( diskCache.isAlive(), "disk cache should not be alive." );
+        assertEquals( CacheStatus.DISPOSED, diskCache.getStatus(), "Status should be disposed" );
     }
 
     /**
@@ -217,7 +217,7 @@ public void testDispose()
      * @throws IOException
      */
     @Test
-    public void testRemoveAll_allowed()
+    void testRemoveAll_allowed()
         throws IOException
     {
         // SETUP
@@ -238,7 +238,7 @@ public void testRemoveAll_allowed()
         diskCache.removeAll();
 
         // VERIFY
-        assertNull( "Item should not be in the map.", diskCache.get( key ) );
+        assertNull( diskCache.get( key ), "Item should not be in the map." );
     }
 
     /**
@@ -247,7 +247,7 @@ public void testRemoveAll_allowed()
      * @throws IOException
      */
     @Test
-    public void testRemoveAll_notAllowed()
+    void testRemoveAll_notAllowed()
         throws IOException
     {
         // SETUP
@@ -272,8 +272,8 @@ public void testRemoveAll_notAllowed()
         final String result = stringWriter.toString();
 
         // VERIFY
-        assertTrue( "Should say not allowed.", result.indexOf( "set to false" ) != -1 );
-        assertNotNull( "Item should be in the map.", diskCache.get( key ) );
+        assertTrue( result.indexOf( "set to false" ) != -1, "Should say not allowed." );
+        assertNotNull( diskCache.get( key ), "Item should be in the map." );
     }
 
     /**
@@ -282,7 +282,7 @@ public void testRemoveAll_notAllowed()
      * @throws IOException
      */
     @Test
-    public void testUpdateGet_allowed()
+    void testUpdateGet_allowed()
         throws IOException
     {
         // SETUP
@@ -304,6 +304,6 @@ public void testUpdateGet_allowed()
 
         // VERIFY
         //System.out.println( diskCache.getStats() );
-        assertNotNull( "Item should be in the map.", result );
+        assertNotNull( result, "Item should be in the map." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/PurgatoryElementUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/PurgatoryElementUnitTest.java
index 22333b4b2..fe11a694a 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/PurgatoryElementUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/PurgatoryElementUnitTest.java
@@ -19,22 +19,22 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.commons.jcs3.engine.CacheElement;
 import org.apache.commons.jcs3.engine.ElementAttributes;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
 import org.apache.commons.jcs3.engine.behavior.IElementAttributes;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Simple unit tests for the Purgatory Element. */
-public class PurgatoryElementUnitTest
+class PurgatoryElementUnitTest
 {
     /** Verify basic data */
     @Test
-    public void testElementAttributes_normal()
+    void testElementAttributes_normal()
     {
         // SETUP
         final String cacheName = "myCacheName";
@@ -50,12 +50,12 @@ public void testElementAttributes_normal()
         final IElementAttributes result = cacheElement.getElementAttributes();
 
         // VERIFY
-        assertEquals( "Should have set the attributes on the element", elementAttributes, result );
+        assertEquals( elementAttributes, result, "Should have set the attributes on the element" );
     }
 
     /** Verify basic data */
     @Test
-    public void testSpoolable_normal()
+    void testSpoolable_normal()
     {
         // SETUP
         final String cacheName = "myCacheName";
@@ -70,12 +70,12 @@ public void testSpoolable_normal()
         final boolean result = purgatoryElement.isSpoolable();
 
         // VERIFY
-        assertFalse( "Should not be spoolable.", result );
+        assertFalse( result, "Should not be spoolable." );
     }
 
     /** Verify basic data */
     @Test
-    public void testToString_normal()
+    void testToString_normal()
     {
         // SETUP
         final String cacheName = "myCacheName";
@@ -89,8 +89,8 @@ public void testToString_normal()
         final String result = purgatoryElement.toString();
 
         // VERIFY
-        assertTrue( "Should have the cacheName.", result.indexOf( cacheName ) != -1 );
-        assertTrue( "Should have the key.", result.indexOf( key ) != -1 );
-        assertTrue( "Should have the value.", result.indexOf( value ) != -1 );
+        assertTrue( result.indexOf( cacheName ) != -1, "Should have the cacheName." );
+        assertTrue( result.indexOf( key ) != -1, "Should have the key." );
+        assertTrue( result.indexOf( value ) != -1, "Should have the value." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/AbstractBlockDiskCacheUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/AbstractBlockDiskCacheUnitTest.java
index 91ac000b9..7e4078e1c 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/AbstractBlockDiskCacheUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/AbstractBlockDiskCacheUnitTest.java
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -37,7 +37,7 @@
 import org.apache.commons.jcs3.engine.control.group.GroupAttrName;
 import org.apache.commons.jcs3.engine.control.group.GroupId;
 import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the Block Disk Cache */
 public abstract class AbstractBlockDiskCacheUnitTest{
@@ -108,12 +108,13 @@ public void oneLoadFromDisk() throws Exception
         for (int i = 0; i < 50; i++)
         {
             final ICacheElement<String, X> afterElement = diskCache.get("x" + i);
-            assertNotNull("Missing element from cache. Cache size: " + diskCache.getSize() + " element: x" + i, afterElement);
+            assertNotNull( afterElement,
+                           "Missing element from cache. Cache size: " + diskCache.getSize() + " element: x" + i );
             final X after = afterElement.getVal();
 
             assertNotNull(after);
-            assertEquals("wrong string after retrieval", string, after.string);
-            assertEquals("wrong bytes after retrieval", string, new String(after.bytes, StandardCharsets.UTF_8));
+            assertEquals( string, after.string, "wrong string after retrieval" );
+            assertEquals( string, new String( after.bytes, StandardCharsets.UTF_8 ), "wrong bytes after retrieval" );
         }
 
         diskCache.dispose();
@@ -193,7 +194,7 @@ public void testChunk_BigString() throws Exception
 
         final Serializable result = elementSerializer.deSerialize(resultData, null);
         // System.out.println( result );
-        assertEquals("wrong string after retrieval", string, result);
+        assertEquals( string, result, "wrong string after retrieval" );
         blockDisk.close();
     }
 
@@ -245,7 +246,7 @@ public void testPutGet_BigString() throws Exception
         final String after = afterElement.getVal();
 
         assertNotNull(after);
-        assertEquals("wrong string after retrieval", string, after);
+        assertEquals( string, after, "wrong string after retrieval" );
     }
 
     /**
@@ -276,7 +277,7 @@ public void testPutGetMatching_NoWait() throws Exception
         final Map<String, ICacheElement<String, String>> matchingResults = diskCache.getMatching("1.8.+");
 
         // VERIFY
-        assertEquals("Wrong number returned", 10, matchingResults.size());
+        assertEquals( 10, matchingResults.size(), "Wrong number returned" );
         // System.out.println( "matchingResults.keySet() " + matchingResults.keySet() );
         // System.out.println( "\nAFTER TEST \n" + diskCache.getStats() );
     }
@@ -304,7 +305,7 @@ public void testPutGetMatching_SmallWait() throws Exception
         final Map<String, ICacheElement<String, String>> matchingResults = diskCache.getMatching("1.8.+");
 
         // VERIFY
-        assertEquals("Wrong number returned", 10, matchingResults.size());
+        assertEquals( 10, matchingResults.size(), "Wrong number returned" );
         // System.out.println( "matchingResults.keySet() " + matchingResults.keySet() );
         // System.out.println( "\nAFTER TEST \n" + diskCache.getStats() );
     }
@@ -348,7 +349,7 @@ public void testRemove_Group() throws IOException
         {
             final GroupAttrName<String> groupAttrName = getGroupAttrName(cacheName, groupName, i + ":key");
             final ICacheElement<GroupAttrName<String>, String> element = disk.processGet(groupAttrName);
-            assertNotNull("Should have received an element.", element);
+            assertNotNull( element, "Should have received an element." );
         }
 
         // DO WORK
@@ -361,7 +362,7 @@ public void testRemove_Group() throws IOException
             final ICacheElement<GroupAttrName<String>, String> element = disk.processGet(groupAttrName);
 
             // VERIFY
-            assertNull("Should not have received an element.", element);
+            assertNull( element, "Should not have received an element." );
         }
 
     }
@@ -398,7 +399,7 @@ public void testRemove_PartialKey() throws IOException
         for (int i = 0; i < cnt; i++)
         {
             final ICacheElement<String, String> element = disk.processGet(i + ":key");
-            assertNotNull("Shoulds have received an element.", element);
+            assertNotNull( element, "Shoulds have received an element." );
         }
 
         // remove each
@@ -406,7 +407,7 @@ public void testRemove_PartialKey() throws IOException
         {
             disk.remove(i + ":");
             final ICacheElement<String, String> element = disk.processGet(i + ":key");
-            assertNull("Should not have received an element.", element);
+            assertNull( element, "Should not have received an element." );
         }
     }
 
@@ -441,7 +442,7 @@ public void testRemoveItems() throws IOException
         {
             disk.remove("key:" + i);
             final ICacheElement<String, String> element = disk.processGet("key:" + i);
-            assertNull("Should not have received an element.", element);
+            assertNull( element, "Should not have received an element." );
         }
     }
 
@@ -486,7 +487,7 @@ public void testUTF8ByteArray() throws Exception
         final byte[] after = afterElement.getVal();
 
         assertNotNull(after);
-        assertEquals("wrong bytes after retrieval", bytes.length, after.length);
+        assertEquals( bytes.length, after.length, "wrong bytes after retrieval" );
         // assertEquals( "wrong bytes after retrieval", bytes, after );
         // assertEquals( "wrong bytes after retrieval", string, new String( after, StandardCharsets.UTF_8 ) );
 
@@ -533,7 +534,7 @@ public void testUTF8String() throws Exception
         final String after = afterElement.getVal();
 
         assertNotNull(after);
-        assertEquals("wrong string after retrieval", string, after);
+        assertEquals( string, after, "wrong string after retrieval" );
     }
 
     /**
@@ -578,8 +579,8 @@ public void testUTF8StringAndBytes() throws Exception
         final X after = afterElement.getVal();
 
         assertNotNull(after);
-        assertEquals("wrong string after retrieval", string, after.string);
-        assertEquals("wrong bytes after retrieval", string, new String(after.bytes, StandardCharsets.UTF_8));
+        assertEquals( string, after.string, "wrong string after retrieval" );
+        assertEquals( string, new String( after.bytes, StandardCharsets.UTF_8 ), "wrong bytes after retrieval" );
 
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheConcurrentUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheConcurrentUnitTest.java
index 61a030855..91f5d5eda 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheConcurrentUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheConcurrentUnitTest.java
@@ -1,13 +1,5 @@
 package org.apache.commons.jcs3.auxiliary.disk.block;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -27,14 +19,19 @@
  * under the License.
  */
 
-import junit.extensions.ActiveTestSuite;
-import junit.framework.Test;
-import junit.framework.TestCase;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test which exercises the block disk cache. This one uses three different
@@ -42,21 +39,25 @@
  */
 public class BlockDiskCacheConcurrentUnitTest
 {
+
     /**
      * Number of items to cache, twice the configured maxObjects for the memory
      * cache regions.
      */
     private static final int items = 200;
 
+    @BeforeEach
+    void setUp()
+        throws Exception
+    {
+        JCS.setConfigFilename( "/TestBlockDiskCache.ccf" );
+        JCS.getInstance( "indexedRegion1" ).clear();
+        JCS.getInstance( "indexedRegion2" ).clear();
+        JCS.getInstance( "indexedRegion3" ).clear();
+    }
+
     /**
-     * Adds items to cache, gets them, and removes them. The item count is more
-     * than the size of the memory cache, so items should spool to disk.
-     *
-     * @param region
-     *            Name of the region to access
-     *
-     * @throws Exception
-     *                If an error occurs
+     * Common method to test cache operations.
      */
     public static void runTestForRegion( final String region )
         throws Exception
@@ -73,7 +74,6 @@ public static void runTestForRegion( final String region )
         for ( int i = 0; i < items; i++ )
         {
             final String value = jcs.get( i + ":key" );
-
             assertEquals( region + " data " + i, value );
         }
 
@@ -88,8 +88,8 @@ public static void runTestForRegion( final String region )
         for ( int i = 0; i < items; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", region + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( region + " data " + i, element.getVal(), "value " + i + ":key" );
         }
 
         // Remove all the items
@@ -99,25 +99,14 @@ public static void runTestForRegion( final String region )
         }
 
         // Verify removal
-        // another thread may have inserted since
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key" + "\n stats " + jcs.getStats(), jcs
-                .get( i + ":key" ) );
+            assertNull( jcs.get( i + ":key" ), "Removed key should be null: " + i + ":key\n stats " + jcs.getStats() );
         }
     }
 
     /**
-     * Adds items to cache, gets them, and removes them. The item count is more
-     * than the size of the memory cache, so items should spool to disk.
-     *
-     * @param region
-     *            Name of the region to access
-     * @param start
-     * @param end
-     *
-     * @throws Exception
-     *                If an error occurs
+     * Overloaded method to test cache operations in a range.
      */
     public static void runTestForRegionInRange( final String region, final int start, final int end )
         throws Exception
@@ -134,7 +123,6 @@ public static void runTestForRegionInRange( final String region, final int start
         for ( int i = start; i < end; i++ )
         {
             final String value = jcs.get( i + ":key" );
-
             assertEquals( region + " data " + i, value );
         }
 
@@ -149,8 +137,8 @@ public static void runTestForRegionInRange( final String region, final int start
         for ( int i = start; i < end; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", region + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( region + " data " + i, element.getVal(), "value " + i + ":key" );
         }
 
         // Remove all the items
@@ -159,82 +147,41 @@ public static void runTestForRegionInRange( final String region, final int start
             jcs.remove( i + ":key" );
         }
 
-//        System.out.println( jcs.getStats() );
-
         // Verify removal
-        // another thread may have inserted since
         for ( int i = start; i < end; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key " + "\n stats " + jcs.getStats(), jcs.get( i
-                + ":key" ) );
+            assertNull( jcs.get( i + ":key" ), "Removed key should be null: " + i + ":key\n stats " + jcs.getStats() );
         }
     }
 
     /**
-     * A unit test suite for JUnit
-     *
-     * @return The test suite
-     * @throws Exception
+     * Test methods for different regions.
      */
-    public static Test suite()
+    @Test
+    void testBlockDiskCache1()
         throws Exception
     {
-        final ActiveTestSuite suite = new ActiveTestSuite();
+        runTestForRegion( "indexedRegion1" );
+    }
 
-        JCS.setConfigFilename( "/TestBlockDiskCache.ccf" );
-        JCS.getInstance( "indexedRegion1" ).clear();
-        JCS.getInstance( "indexedRegion2" ).clear();
-        JCS.getInstance( "indexedRegion3" ).clear();
+    @Test
+    void testBlockDiskCache2()
+        throws Exception
+    {
+        runTestForRegion( "indexedRegion2" );
+    }
 
-        suite.addTest(new TestCase("testBlockDiskCache1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion1" );
-            }
-        });
-
-        suite.addTest(new TestCase("testBlockDiskCache2" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion2" );
-            }
-        });
-
-        suite.addTest(new TestCase("testBlockDiskCache3" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion3" );
-            }
-        });
-
-        suite.addTest(new TestCase("testBlockDiskCache4" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegionInRange( "indexedRegion3", 300, 600 );
-            }
-        });
-
-        return suite;
+    @Test
+    void testBlockDiskCache3()
+        throws Exception
+    {
+        runTestForRegion( "indexedRegion3" );
     }
 
-    /**
-     * Test setup
-     */
-    @Before
-    public void setUp()
+    @Test
+    void testBlockDiskCache4()
+        throws Exception
     {
-        JCS.setConfigFilename( "/TestBlockDiskCache.ccf" );
+        runTestForRegionInRange( "indexedRegion3", 300, 600 );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheKeyStoreUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheKeyStoreUnitTest.java
index a4e207c8f..7a07e298a 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheKeyStoreUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheKeyStoreUnitTest.java
@@ -19,17 +19,17 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.apache.commons.jcs3.auxiliary.disk.behavior.IDiskCacheAttributes.DiskLimitType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the keyStore.
  */
-public class BlockDiskCacheKeyStoreUnitTest
+class BlockDiskCacheKeyStoreUnitTest
 {
     /** Directory name */
     private final String rootDirName = "target/test-sandbox/block";
@@ -48,16 +48,16 @@ private void innerTestPutKeys(final BlockDiskCacheAttributes attributes)
         // System.out.println( "testPutKeys " + keyStore );
 
         // VERIFY
-        assertEquals("Wrong number of keys", numElements, keyStore.size());
+        assertEquals( numElements, keyStore.size(), "Wrong number of keys" );
         for (int i = 0; i < numElements; i++)
         {
             final int[] result = keyStore.get(String.valueOf(i));
-            assertEquals("Wrong array returned.", i, result.length);
+            assertEquals( i, result.length, "Wrong array returned." );
         }
     }
 
     @Test
-    public void testObjectLargerThanMaxSize()
+    void testObjectLargerThanMaxSize()
     {
         final BlockDiskCacheAttributes attributes = new BlockDiskCacheAttributes();
         attributes.setCacheName("testObjectLargerThanMaxSize");
@@ -82,8 +82,8 @@ public void testObjectLargerThanMaxSize()
      * @throws Exception
      */
     @Test
-    public void testPutKeys()
-            throws Exception
+    void testPutKeys()
+        throws Exception
     {
         // SETUP
         final BlockDiskCacheAttributes attributes = new BlockDiskCacheAttributes();
@@ -96,8 +96,8 @@ public void testPutKeys()
     }
 
     @Test
-    public void testPutKeysSize()
-            throws Exception
+    void testPutKeysSize()
+        throws Exception
     {
         // SETUP
         final BlockDiskCacheAttributes attributes = new BlockDiskCacheAttributes();
@@ -118,8 +118,8 @@ public void testPutKeysSize()
      * @throws Exception
      */
     @Test
-    public void testSaveLoadKeys()
-            throws Exception
+    void testSaveLoadKeys()
+        throws Exception
     {
         // SETUP
         final BlockDiskCacheAttributes attributes = new BlockDiskCacheAttributes();
@@ -157,30 +157,30 @@ private void testSaveLoadKeysInner(final BlockDiskCacheAttributes attributes)
         // System.out.println( "testSaveLoadKeys " + keyStore );
 
         // VERIFY
-        assertEquals("Wrong number of keys", numElements, keyStore.size());
+        assertEquals( numElements, keyStore.size(), "Wrong number of keys" );
 
         // DO WORK
         keyStore.saveKeys();
         keyStore.clearMemoryMap();
 
         // VERIFY
-        assertEquals("Wrong number of keys after clearing memory", 0, keyStore.size());
+        assertEquals( 0, keyStore.size(), "Wrong number of keys after clearing memory" );
 
         // DO WORK
         keyStore.loadKeys();
 
         // VERIFY
-        assertEquals("Wrong number of keys after loading", numElements, keyStore.size());
+        assertEquals( numElements, keyStore.size(), "Wrong number of keys after loading" );
         for (int i = 0; i < numElements; i++)
         {
             final int[] result = keyStore.get(String.valueOf(i));
-            assertEquals("Wrong array returned.", i, result.length);
+            assertEquals( i, result.length, "Wrong array returned." );
         }
     }
 
     @Test
-    public void testSaveLoadKeysSize()
-            throws Exception
+    void testSaveLoadKeysSize()
+        throws Exception
     {
         // SETUP
         final BlockDiskCacheAttributes attributes = new BlockDiskCacheAttributes();
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java
index a0168de29..0506b4910 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java
@@ -19,13 +19,13 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.access.TestCacheAccess;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * This is used by other tests to generate a random load on the disk cache.
@@ -67,14 +67,14 @@ public static void runTestForRegion( final String region, final int range, final
     /**
      * Test setup
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
     {
         JCS.setConfigFilename( "/TestBlockDiskCacheCon.ccf" );
     }
 
     @Test
-    public void test()
+    void test()
     {
 
     }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheSameRegionConcurrentUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheSameRegionConcurrentUnitTest.java
index 980c601b9..e8d1312f7 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheSameRegionConcurrentUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheSameRegionConcurrentUnitTest.java
@@ -19,33 +19,34 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import junit.extensions.ActiveTestSuite;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test which exercises the block disk cache. Runs four threads against the same region.
  */
 public class BlockDiskCacheSameRegionConcurrentUnitTest
 {
+
+    @BeforeEach
+    void setUp()
+    {
+        // Set the configuration file
+        JCS.setConfigFilename( "/TestBlockDiskCacheCon.ccf" );
+    }
+
     /**
-     * Adds items to cache, gets them, and removes them. The item count is more than the size of the
-     * memory cache, so items should spool to disk.
-     * @param region Name of the region to access
-     * @param start
-     * @param end
-     * @throws Exception If an error occurs
+     * Helper method to test cache operations within a specific range in the region.
      */
     public static void runTestForRegion( final String region, final int start, final int end )
         throws Exception
@@ -64,7 +65,7 @@ public static void runTestForRegion( final String region, final int start, final
             final String key = i + ":key";
             final String value = jcs.get( key );
 
-            assertEquals( "Wrong value for key [" + key + "]", region + " data " + i + "-" + region, value );
+            assertEquals( region + " data " + i + "-" + region, value, "Wrong value for key [" + key + "]" );
         }
 
         // Test that getElements returns all the expected values
@@ -78,60 +79,36 @@ public static void runTestForRegion( final String region, final int start, final
         for ( int i = start; i < end; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", region + " data " + i + "-" + region, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( region + " data " + i + "-" + region, element.getVal(), "value " + i + ":key" );
         }
     }
 
-    /**
-     * A unit test suite for JUnit
-     * @return The test suite
-     */
-    public static Test suite()
+    @Test
+    void testBlockDiskCache1()
+        throws Exception
     {
-        JCS.setConfigFilename( "/TestBlockDiskCacheCon.ccf" );
-        final ActiveTestSuite suite = new ActiveTestSuite();
+        runTestForRegion( "blockRegion4", 0, 200 );
+    }
 
-        suite.addTest(new TestCase("testBlockDiskCache1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "blockRegion4", 0, 200 );
-            }
-        });
-
-        suite.addTest(new TestCase("testBlockDiskCache2" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "blockRegion4", 1000, 1200 );
-            }
-        });
-
-        suite.addTest(new TestCase("testBlockDiskCache3" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "blockRegion4", 2000, 2200 );
-            }
-        });
-
-        suite.addTest(new TestCase("testBlockDiskCache4" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "blockRegion4", 2200, 5200 );
-            }
-        });
-
-        return suite;
+    @Test
+    void testBlockDiskCache2()
+        throws Exception
+    {
+        runTestForRegion( "blockRegion4", 1000, 1200 );
+    }
+
+    @Test
+    void testBlockDiskCache3()
+        throws Exception
+    {
+        runTestForRegion( "blockRegion4", 2000, 2200 );
+    }
+
+    @Test
+    void testBlockDiskCache4()
+        throws Exception
+    {
+        runTestForRegion( "blockRegion4", 2200, 5200 );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheSteadyLoadTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheSteadyLoadTest.java
index ffe3849bf..9b9bc8ac7 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheSteadyLoadTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheSteadyLoadTest.java
@@ -25,13 +25,13 @@
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.auxiliary.disk.DiskTestObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * This allows you to put thousands of large objects into the disk cache and to force removes to
  * trigger optimizations along the way.
  */
-public class BlockDiskCacheSteadyLoadTest
+class BlockDiskCacheSteadyLoadTest
 {
     /** String for separating log entries. */
     private static final String LOG_DIVIDER = "---------------------------";
@@ -62,7 +62,7 @@ private static void logMemoryUsage()
      * @throws Exception
      */
     @Test
-    public void testRunSteadyLoadTest()
+    void testRunSteadyLoadTest()
         throws Exception
     {
         JCS.setConfigFilename( "/TestBlockDiskCacheSteadyLoad.ccf" );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskUnitTest.java
index 6948b7297..891094643 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskUnitTest.java
@@ -19,22 +19,22 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Random;
 
 import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for the disk access layer of the Block Disk Cache.
  */
-public class BlockDiskUnitTest
+class BlockDiskUnitTest
 {
     /** Data file. */
     private File rafDir;
@@ -56,8 +56,9 @@ private int getBytesForBlocksOfByteArrays( final int blockSize, final int numBlo
     /**
      * Creates the base directory
      */
-    @Before
-    public void setUp() throws Exception
+    @BeforeEach
+    void setUp()
+        throws Exception
     {
         final String rootDirName = "target/test-sandbox/block";
         this.rafDir = new File( rootDirName );
@@ -78,8 +79,9 @@ private void setUpBlockDisk(final String fileName, final int blockSize) throws I
         this.disk = new BlockDisk(file, blockSize, new StandardSerializer());
     }
 
-    @After
-    public void tearDown() throws Exception
+    @AfterEach
+    void tearDown()
+        throws Exception
     {
         disk.close();
     }
@@ -90,7 +92,7 @@ public void tearDown() throws Exception
      * @throws Exception
      */
     @Test
-    public void testCalculateBlocksNeededDouble()
+    void testCalculateBlocksNeededDouble()
         throws Exception
     {
         // SETUP
@@ -101,16 +103,17 @@ public void testCalculateBlocksNeededDouble()
             - 2 * BlockDisk.HEADER_SIZE_BYTES]);
 
         // Verify
-        assertEquals( "Wrong number of blocks", 2, result );
+        assertEquals( 2, result, "Wrong number of blocks" );
     }
 
     @Test
-    public void testJCS156() throws Exception
+    void testJCS156()
+        throws Exception
     {
         // SETUP
         setUpBlockDisk("testJCS156", 4096);
         final long offset = disk.calculateByteOffsetForBlockAsLong(Integer.MAX_VALUE);
-        assertTrue("Must not wrap round", offset > 0);
+        assertTrue( offset > 0, "Must not wrap round" );
         assertEquals(Integer.MAX_VALUE * 4096L, offset);
     }
 
@@ -120,7 +123,7 @@ public void testJCS156() throws Exception
      * @throws Exception
      */
     @Test
-    public void testWrite_128BlockElement()
+    void testWrite_128BlockElement()
         throws Exception
     {
         // SETUP
@@ -134,9 +137,9 @@ public void testWrite_128BlockElement()
         final int[] blocks = disk.write( new byte[bytes]);
 
         // VERIFY
-        assertEquals( "Wrong number of blocks recorded.", numBlocks, disk.getNumberOfBlocks() );
-        assertEquals( "Wrong number of blocks returned.", numBlocks, blocks.length );
-        assertEquals( "Wrong block returned.", 0, blocks[0]);
+        assertEquals( numBlocks, disk.getNumberOfBlocks(), "Wrong number of blocks recorded." );
+        assertEquals( numBlocks, blocks.length, "Wrong number of blocks returned." );
+        assertEquals( 0, blocks[0], "Wrong block returned." );
     }
 
     /**
@@ -145,7 +148,7 @@ public void testWrite_128BlockElement()
      * @throws Exception
      */
     @Test
-    public void testWrite_DoubleBlockElement()
+    void testWrite_DoubleBlockElement()
         throws Exception
     {
         // SETUP
@@ -157,9 +160,9 @@ public void testWrite_DoubleBlockElement()
         final int[] blocks = disk.write( new byte[bytes]);
 
         // VERIFY
-        assertEquals( "Wrong number of blocks recorded.", 2, disk.getNumberOfBlocks() );
-        assertEquals( "Wrong number of blocks returned.", 2, blocks.length );
-        assertEquals( "Wrong block returned.", 0, blocks[0]);
+        assertEquals( 2, disk.getNumberOfBlocks(), "Wrong number of blocks recorded." );
+        assertEquals( 2, blocks.length, "Wrong number of blocks returned." );
+        assertEquals( 0, blocks[0], "Wrong block returned." );
     }
 
     /**
@@ -168,7 +171,7 @@ public void testWrite_DoubleBlockElement()
      * @throws Exception
      */
     @Test
-    public void testWrite_NullBlockElement()
+    void testWrite_NullBlockElement()
         throws Exception
     {
         // SETUP
@@ -178,9 +181,9 @@ public void testWrite_NullBlockElement()
         final int[] blocks = disk.write( null );
 
         // VERIFY
-        assertEquals( "Wrong number of blocks recorded.", 1, disk.getNumberOfBlocks() );
-        assertEquals( "Wrong number of blocks returned.", 1, blocks.length );
-        assertEquals( "Wrong block returned.", 0, blocks[0]);
+        assertEquals( 1, disk.getNumberOfBlocks(), "Wrong number of blocks recorded." );
+        assertEquals( 1, blocks.length, "Wrong number of blocks returned." );
+        assertEquals( 0, blocks[0], "Wrong block returned." );
     }
 
     /**
@@ -189,7 +192,7 @@ public void testWrite_NullBlockElement()
      * @throws Exception
      */
     @Test
-    public void testWrite_SingleBlockElement()
+    void testWrite_SingleBlockElement()
         throws Exception
     {
         // SETUP
@@ -200,9 +203,9 @@ public void testWrite_SingleBlockElement()
         final int[] blocks = disk.write( new byte[bytes]);
 
         // VERIFY
-        assertEquals( "Wrong number of blocks recorded.", 1, disk.getNumberOfBlocks() );
-        assertEquals( "Wrong number of blocks returned.", 1, blocks.length );
-        assertEquals( "Wrong block returned.", 0, blocks[0]);
+        assertEquals( 1, disk.getNumberOfBlocks(), "Wrong number of blocks recorded." );
+        assertEquals( 1, blocks.length, "Wrong number of blocks returned." );
+        assertEquals( 0, blocks[0], "Wrong block returned." );
     }
 
     /**
@@ -211,7 +214,7 @@ public void testWrite_SingleBlockElement()
      * @throws Exception
      */
     @Test
-    public void testWrite_TwoSingleBlockElements()
+    void testWrite_TwoSingleBlockElements()
         throws Exception
     {
         // SETUP
@@ -223,11 +226,11 @@ public void testWrite_TwoSingleBlockElements()
         final int[] blocks2 = disk.write( new byte[bytes]);
 
         // VERIFY
-        assertEquals( "Wrong number of blocks recorded.", 2, disk.getNumberOfBlocks() );
-        assertEquals( "Wrong number of blocks returned.", 1, blocks1.length );
-        assertEquals( "Wrong block returned.", 0, blocks1[0]);
-        assertEquals( "Wrong number of blocks returned.", 1, blocks2.length );
-        assertEquals( "Wrong block returned.", 1, blocks2[0]);
+        assertEquals( 2, disk.getNumberOfBlocks(), "Wrong number of blocks recorded." );
+        assertEquals( 1, blocks1.length, "Wrong number of blocks returned." );
+        assertEquals( 0, blocks1[0], "Wrong block returned." );
+        assertEquals( 1, blocks2.length, "Wrong number of blocks returned." );
+        assertEquals( 1, blocks2[0], "Wrong block returned." );
     }
 
     /**
@@ -236,7 +239,7 @@ public void testWrite_TwoSingleBlockElements()
      * @throws Exception
      */
     @Test
-    public void testWriteAndRead_BigString()
+    void testWriteAndRead_BigString()
         throws Exception
     {
         // SETUP
@@ -259,7 +262,7 @@ public void testWriteAndRead_BigString()
 //        System.out.println( string );
 //        System.out.println( result );
 //        System.out.println( disk );
-        assertEquals( "Wrong item retured.", string, result );
+        assertEquals( string, result, "Wrong item retured." );
     }
 
     /**
@@ -268,7 +271,7 @@ public void testWriteAndRead_BigString()
      * @throws Exception
      */
     @Test
-    public void testWriteAndRead_BigString2()
+    void testWriteAndRead_BigString2()
         throws Exception
     {
         // SETUP
@@ -283,7 +286,7 @@ public void testWriteAndRead_BigString2()
         final String result = (String) disk.read( blocks );
 
         // VERIFY
-        assertEquals( "Wrong item retured.", string, result );
+        assertEquals( string, result, "Wrong item retured." );
     }
 
     /**
@@ -292,7 +295,7 @@ public void testWriteAndRead_BigString2()
      * @throws Exception
      */
     @Test
-    public void testWriteAndRead_SingleBlockElement()
+    void testWriteAndRead_SingleBlockElement()
         throws Exception
     {
         // SETUP
@@ -305,7 +308,7 @@ public void testWriteAndRead_SingleBlockElement()
         final byte[] result = (byte[]) disk.read( blocks );
 
         // VERIFY
-        assertEquals( "Wrong item retured.", new byte[bytes].length, result.length );
+        assertEquals( new byte[bytes].length, result.length, "Wrong item retured." );
     }
 
     /**
@@ -314,7 +317,7 @@ public void testWriteAndRead_SingleBlockElement()
      * @throws Exception
      */
     @Test
-    public void testWriteAndReadMultipleMultiBlockElement()
+    void testWriteAndReadMultipleMultiBlockElement()
         throws Exception
     {
         // SETUP
@@ -331,8 +334,8 @@ public void testWriteAndReadMultipleMultiBlockElement()
             final byte[] result = (byte[]) disk.read( blocks );
 
             // VERIFY
-            assertEquals( "Wrong item retured.", new byte[bytes].length, result.length );
-            assertEquals( "Wrong number of blocks returned.", numBlocksPerElement, blocks.length );
+            assertEquals( new byte[bytes].length, result.length, "Wrong item retured." );
+            assertEquals( numBlocksPerElement, blocks.length, "Wrong number of blocks returned." );
         }
     }
 
@@ -342,7 +345,7 @@ public void testWriteAndReadMultipleMultiBlockElement()
      * @throws Exception
      */
     @Test
-    public void testWriteAndReadMultipleMultiBlockElement_setSize()
+    void testWriteAndReadMultipleMultiBlockElement_setSize()
         throws Exception
     {
         // SETUP
@@ -362,14 +365,15 @@ public void testWriteAndReadMultipleMultiBlockElement_setSize()
             final byte[] result = (byte[]) disk.read( blocks );
 
             // VERIFY
-            assertEquals( "Wrong item length retured.", src.length, result.length );
-            assertEquals( "Wrong number of blocks returned.", numBlocksPerElement, blocks.length );
+            assertEquals( src.length, result.length, "Wrong item length retured." );
+            assertEquals( numBlocksPerElement, blocks.length, "Wrong number of blocks returned." );
 
             // We check the array contents, too, to ensure we read back what we wrote out
             for (int j = 0 ; j < src.length ; j++) {
-                assertEquals( "Mismatch at offset " + j + " in attempt # " + (i + 1), src[j], result[j]);
+                assertEquals( src[j], result[j], "Mismatch at offset " + j + " in attempt # " + ( i + 1 ) );
             }
         }
-        assertEquals( "Wrong number of elements. "+disk, numBlocksPerElement * numElements, disk.getNumberOfBlocks() );
+        assertEquals( numBlocksPerElement * numElements, disk.getNumberOfBlocks(),
+                      "Wrong number of elements. " + disk );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/HugeQuantityBlockDiskCacheLoadTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/HugeQuantityBlockDiskCacheLoadTest.java
index ac61bc924..eff37539a 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/HugeQuantityBlockDiskCacheLoadTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/HugeQuantityBlockDiskCacheLoadTest.java
@@ -19,19 +19,19 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.utils.timing.ElapsedTimer;
 import org.apache.commons.jcs3.utils.timing.SleepUtil;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Put a few hundred thousand entries in the block disk cache.
  */
-public class HugeQuantityBlockDiskCacheLoadTest
+class HugeQuantityBlockDiskCacheLoadTest
 {
 
     /**
@@ -51,8 +51,8 @@ protected long measureMemoryUse()
     /**
      * Test setup
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
     {
         JCS.setConfigFilename( "/TestBlockDiskCacheHuge.ccf" );
     }
@@ -64,7 +64,7 @@ public void setUp()
      * @throws Exception If an error occurs
      */
     @Test
-    public void testLargeNumberOfItems()
+    void testLargeNumberOfItems()
         throws Exception
     {
         final int items = 300000;
@@ -119,7 +119,7 @@ public void testLargeNumberOfItems()
                     //System.out.print(  "\033[r" );
                     System.out.println( i + " " );
                 }
-                assertEquals( "Wrong value returned.", region + " data " + i, value );
+                assertEquals( region + " data " + i, value, "Wrong value returned." );
             }
             final long aftetGet = measureMemoryUse();
             System.out.println( "After get: " + aftetGet + " diff = " + ( aftetGet - initialMemory ) );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/AbstractIndexDiskCacheUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/AbstractIndexDiskCacheUnitTest.java
index eb735953d..557aec7f8 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/AbstractIndexDiskCacheUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/AbstractIndexDiskCacheUnitTest.java
@@ -19,11 +19,11 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -42,7 +42,7 @@
 import org.apache.commons.jcs3.engine.control.group.GroupAttrName;
 import org.apache.commons.jcs3.engine.control.group.GroupId;
 import org.apache.commons.jcs3.utils.timing.SleepUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for common functionality.
@@ -100,8 +100,9 @@ public void oneLoadFromDisk() throws Exception
         for (int i = 0; i < 50; i++)
         {
             final ICacheElement<String, String> afterElement = diskCache.get("x" + i);
-            assertNotNull("Missing element from cache. Cache size: " + diskCache.getSize() + " element: x" + i, afterElement);
-            assertEquals("wrong string after retrieval", string, afterElement.getVal());
+            assertNotNull( afterElement,
+                           "Missing element from cache. Cache size: " + diskCache.getSize() + " element: x" + i );
+            assertEquals( string, afterElement.getVal(), "wrong string after retrieval" );
         }
     }
 
@@ -154,7 +155,7 @@ public void testBytesFreeSize() throws IOException, InterruptedException
 
         // System.out.println( "testBytesFreeSize stats " + disk.getStats() );
 
-        assertEquals("Wrong bytes free size" + disk.getStats(), expectedSize, resultSize);
+        assertEquals( expectedSize, resultSize, "Wrong bytes free size" + disk.getStats() );
 
         // add half as many as we removed. These should all use spots in the recycle bin.
         final int numberToAdd = numberToRemove / 2;
@@ -165,7 +166,7 @@ public void testBytesFreeSize() throws IOException, InterruptedException
 
         final long expectedSize2 = DiskTestObjectUtil.totalSize(elements, numberToAdd);
         final long resultSize2 = disk.getBytesFree();
-        assertEquals("Wrong bytes free size" + disk.getStats(), expectedSize2, resultSize2);
+        assertEquals( expectedSize2, resultSize2, "Wrong bytes free size" + disk.getStats() );
     }
 
     /**
@@ -194,7 +195,7 @@ public void testCheckForDedOverlaps_noOverlap()
         final boolean result = disk.checkForDedOverlaps(sortedDescriptors);
 
         // VERIFY
-        assertTrue("There should be no overlap. it should be ok", result);
+        assertTrue( result, "There should be no overlap. it should be ok" );
     }
 
     /**
@@ -224,7 +225,7 @@ public void testCheckForDedOverlaps_overlaps()
         final boolean result = disk.checkForDedOverlaps(sortedDescriptors);
 
         // VERIFY
-        assertFalse("There should be overlaps. it should be not ok", result);
+        assertFalse( result, "There should be overlaps. it should be not ok" );
     }
 
     /**
@@ -261,7 +262,7 @@ public void testFileSize() throws IOException, InterruptedException
 
         // System.out.println( "testFileSize stats " + disk.getStats() );
 
-        assertEquals("Wrong file size", expectedSize, resultSize);
+        assertEquals( expectedSize, resultSize, "Wrong file size" );
     }
 
     /**
@@ -288,8 +289,8 @@ public void testGet_EventLogging_simple() throws Exception
         diskCache.get("key");
 
         // VERIFY
-        assertEquals("Start should have been called.", 1, cacheEventLogger.startICacheEventCalls);
-        assertEquals("End should have been called.", 1, cacheEventLogger.endICacheEventCalls);
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -320,8 +321,8 @@ public void testGetMultiple_EventLogging_simple() throws Exception
 
         // VERIFY
         // 1 for get multiple and 1 for get.
-        assertEquals("Start should have been called.", 2, cacheEventLogger.startICacheEventCalls);
-        assertEquals("End should have been called.", 2, cacheEventLogger.endICacheEventCalls);
+        assertEquals( 2, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 2, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     @Test
@@ -365,11 +366,11 @@ public void testProcessUpdate_SameKeyBiggerSize() throws IOException
         final ICacheElement<String, String> result = diskCache.processGet(key);
 
         // VERIFY
-        assertNotNull("Should have a result", result);
+        assertNotNull( result, "Should have a result" );
         final long fileSize2 = diskCache.getDataFileSize();
-        assertTrue("File should be greater.", fileSize1 < fileSize2);
+        assertTrue( fileSize1 < fileSize2, "File should be greater." );
         final int binSize = diskCache.getRecyleBinSize();
-        assertEquals("Should be one in the bin.", 1, binSize);
+        assertEquals( 1, binSize, "Should be one in the bin." );
     }
 
     /**
@@ -403,11 +404,11 @@ public void testProcessUpdate_SameKeySameSize() throws IOException
         final ICacheElement<String, String> result = diskCache.processGet(key);
 
         // VERIFY
-        assertNotNull("Should have a result", result);
+        assertNotNull( result, "Should have a result" );
         final long fileSize2 = diskCache.getDataFileSize();
-        assertEquals("File should be the same", fileSize1, fileSize2);
+        assertEquals( fileSize1, fileSize2, "File should be the same" );
         final int binSize = diskCache.getRecyleBinSize();
-        assertEquals("Should be nothing in the bin.", 0, binSize);
+        assertEquals( 0, binSize, "Should be nothing in the bin." );
     }
 
     /**
@@ -442,11 +443,11 @@ public void testProcessUpdate_SameKeySmallerSize() throws IOException
         final ICacheElement<String, String> result = diskCache.processGet(key);
 
         // VERIFY
-        assertNotNull("Should have a result", result);
+        assertNotNull( result, "Should have a result" );
         final long fileSize2 = diskCache.getDataFileSize();
-        assertEquals("File should be the same", fileSize1, fileSize2);
+        assertEquals( fileSize1, fileSize2, "File should be the same" );
         final int binSize = diskCache.getRecyleBinSize();
-        assertEquals("Should be nothing in the bin.", 0, binSize);
+        assertEquals( 0, binSize, "Should be nothing in the bin." );
     }
 
     /**
@@ -475,9 +476,9 @@ public void testProcessUpdate_Simple() throws IOException
         final ICacheElement<String, String> result = diskCache.processGet(key);
 
         // VERIFY
-        assertNotNull("Should have a result", result);
+        assertNotNull( result, "Should have a result" );
         final long fileSize = diskCache.getDataFileSize();
-        assertTrue("File should be greater than 0", fileSize > 0);
+        assertTrue( fileSize > 0, "File should be greater than 0" );
     }
 
     /**
@@ -508,7 +509,7 @@ public void testPutGetMatching_NoWait() throws Exception
         final Map<String, ICacheElement<String, String>> matchingResults = diskCache.getMatching("1.8.+");
 
         // VERIFY
-        assertEquals("Wrong number returned", 10, matchingResults.size());
+        assertEquals( 10, matchingResults.size(), "Wrong number returned" );
         // System.out.println( "matchingResults.keySet() " + matchingResults.keySet() );
         // System.out.println( "\nAFTER TEST \n" + diskCache.getStats() );
     }
@@ -542,7 +543,7 @@ public void testPutGetMatching_SmallWait() throws Exception
         final Map<String, ICacheElement<String, String>> matchingResults = diskCache.getMatching("1.8.+");
 
         // VERIFY
-        assertEquals("Wrong number returned", 10, matchingResults.size());
+        assertEquals( 10, matchingResults.size(), "Wrong number returned" );
         // System.out.println( "matchingResults.keySet() " + matchingResults.keySet() );
         // System.out.println( "\nAFTER TEST \n" + diskCache.getStats() );
     }
@@ -588,7 +589,7 @@ public void testRecyleBinSize() throws IOException, InterruptedException
         }
 
         // verify that the recycle bin has the correct amount.
-        assertEquals("The recycle bin should have the number removed.", numberToRemove, disk.getRecyleBinSize());
+        assertEquals( numberToRemove, disk.getRecyleBinSize(), "The recycle bin should have the number removed." );
     }
 
     /**
@@ -635,7 +636,7 @@ public void testRecyleBinUsage() throws IOException, InterruptedException
         }
 
         // verify that the recycle bin has the correct amount.
-        assertEquals("The recycle bin should have the number removed.", numberToRemove, disk.getRecyleBinSize());
+        assertEquals( numberToRemove, disk.getRecyleBinSize(), "The recycle bin should have the number removed." );
 
         // add half as many as we removed. These should all use spots in the recycle bin.
         final int numberToAdd = numberToRemove / 2;
@@ -645,7 +646,8 @@ public void testRecyleBinUsage() throws IOException, InterruptedException
         }
 
         // verify that we used the correct number of spots
-        assertEquals("The recycle bin should have the number removed." + disk.getStats(), numberToAdd, disk.getRecyleCount());
+        assertEquals( numberToAdd, disk.getRecyleCount(),
+                      "The recycle bin should have the number removed." + disk.getStats() );
     }
 
     /**
@@ -672,8 +674,8 @@ public void testRemove_EventLogging_simple() throws Exception
         diskCache.remove("key");
 
         // VERIFY
-        assertEquals("Start should have been called.", 1, cacheEventLogger.startICacheEventCalls);
-        assertEquals("End should have been called.", 1, cacheEventLogger.endICacheEventCalls);
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -715,7 +717,7 @@ public void testRemove_Group() throws IOException
         {
             final GroupAttrName<String> groupAttrName = getGroupAttrName(cacheName, groupName, i + ":key");
             final ICacheElement<GroupAttrName<String>, String> element = disk.processGet(groupAttrName);
-            assertNotNull("Should have received an element.", element);
+            assertNotNull( element, "Should have received an element." );
         }
 
         // DO WORK
@@ -728,7 +730,7 @@ public void testRemove_Group() throws IOException
             final ICacheElement<GroupAttrName<String>, String> element = disk.processGet(groupAttrName);
 
             // VERIFY
-            assertNull("Should not have received an element.", element);
+            assertNull( element, "Should not have received an element." );
         }
 
     }
@@ -765,7 +767,7 @@ public void testRemove_PartialKey() throws IOException
         for (int i = 0; i < cnt; i++)
         {
             final ICacheElement<String, String> element = disk.processGet(i + ":key");
-            assertNotNull("Shoulds have received an element.", element);
+            assertNotNull( element, "Shoulds have received an element." );
         }
 
         // remove each
@@ -773,10 +775,11 @@ public void testRemove_PartialKey() throws IOException
         {
             disk.remove(i + ":");
             final ICacheElement<String, String> element = disk.processGet(i + ":key");
-            assertNull("Should not have received an element.", element);
+            assertNull( element, "Should not have received an element." );
         }
         // https://issues.apache.org/jira/browse/JCS-67
-        assertEquals("Recylenbin should not have more elements than we removed. Check for JCS-67", cnt, disk.getRecyleBinSize());
+        assertEquals( cnt, disk.getRecyleBinSize(),
+                      "Recylenbin should not have more elements than we removed. Check for JCS-67" );
     }
 
     /**
@@ -803,8 +806,8 @@ public void testRemoveAll_EventLogging_simple() throws Exception
         diskCache.remove("key");
 
         // VERIFY
-        assertEquals("Start should have been called.", 1, cacheEventLogger.startICacheEventCalls);
-        assertEquals("End should have been called.", 1, cacheEventLogger.endICacheEventCalls);
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -838,7 +841,7 @@ public void testRemoveItems() throws IOException
         {
             disk.remove("key:" + i);
             final ICacheElement<String, String> element = disk.processGet("key:" + i);
-            assertNull("Should not have received an element.", element);
+            assertNull( element, "Should not have received an element." );
         }
     }
 
@@ -871,8 +874,8 @@ public void testSimplePutAndGet() throws IOException
         for (int i = 0; i < cnt; i++)
         {
             final ICacheElement<String, String> element = disk.processGet("key:" + i);
-            assertNotNull("Should have received an element.", element);
-            assertEquals("Element is wrong.", "data:" + i, element.getVal());
+            assertNotNull( element, "Should have received an element." );
+            assertEquals( "data:" + i, element.getVal(), "Element is wrong." );
         }
 
         // Test that getMultiple returns all the expected values
@@ -886,8 +889,8 @@ public void testSimplePutAndGet() throws IOException
         for (int i = 0; i < cnt; i++)
         {
             final ICacheElement<String, String> element = elements.get("key:" + i);
-            assertNotNull("element " + i + ":key is missing", element);
-            assertEquals("value key:" + i, "data:" + i, element.getVal());
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( "data:" + i, element.getVal(), "value key:" + i );
         }
         // System.out.println( disk.getStats() );
     }
@@ -920,8 +923,8 @@ public void testUpdate_EventLogging_simple() throws Exception
         SleepUtil.sleepAtLeast(200);
 
         // VERIFY
-        assertEquals("Start should have been called.", 1, cacheEventLogger.startICacheEventCalls);
-        assertEquals("End should have been called.", 1, cacheEventLogger.endICacheEventCalls);
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -964,7 +967,7 @@ public void testUTF8ByteArray() throws Exception
         final byte[] after = afterElement.getVal();
 
         assertNotNull(after);
-        assertEquals("wrong bytes after retrieval", string, new String(after, StandardCharsets.UTF_8));
+        assertEquals( string, new String( after, StandardCharsets.UTF_8 ), "wrong bytes after retrieval" );
     }
 
     /**
@@ -1007,6 +1010,6 @@ public void testUTF8String() throws Exception
         final String after = afterElement.getVal();
 
         assertNotNull(after);
-        assertEquals("wrong string after retrieval", string, after);
+        assertEquals( string, after, "wrong string after retrieval" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/HugeQuantityIndDiskCacheLoadTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/HugeQuantityIndDiskCacheLoadTest.java
index 9ae61417e..60402ab16 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/HugeQuantityIndDiskCacheLoadTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/HugeQuantityIndDiskCacheLoadTest.java
@@ -19,17 +19,17 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Put a few hundred thousand entries in the disk cache.
  */
-public class HugeQuantityIndDiskCacheLoadTest
+class HugeQuantityIndDiskCacheLoadTest
 {
     /**
      * Measure memory used by the VM.
@@ -47,8 +47,8 @@ protected long measureMemoryUse()
     }
 
     /** Test setup.  */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
     {
         JCS.setConfigFilename( "/TestDiskCacheHuge.ccf" );
     }
@@ -60,7 +60,7 @@ public void setUp()
      * @throws Exception If an error occurs
      */
     @Test
-    public void testLargeNumberOfItems()
+    void testLargeNumberOfItems()
         throws Exception
     {
         final int items = 300000;
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexDiskCacheCountUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexDiskCacheCountUnitTest.java
index e3039beb9..fc5366893 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexDiskCacheCountUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexDiskCacheCountUnitTest.java
@@ -19,17 +19,17 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 
 import org.apache.commons.jcs3.auxiliary.disk.behavior.IDiskCacheAttributes.DiskLimitType;
 import org.apache.commons.jcs3.engine.CacheElement;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class IndexDiskCacheCountUnitTest extends AbstractIndexDiskCacheUnitTest
 {
@@ -43,8 +43,8 @@ public IndexedDiskCacheAttributes getCacheAttributes()
 	}
 
     @Test
-    public void testRecycleBin()
-		        throws IOException
+    void testRecycleBin()
+        throws IOException
     {
         final IndexedDiskCacheAttributes cattr = getCacheAttributes();
         cattr.setCacheName( "testRemoveItems" );
@@ -98,13 +98,13 @@ public void testRecycleBin()
                 final String expectedValue = expect[i];
                 if ( expectedValue == null )
                 {
-                    assertNull( "Expected a null element", element );
+                    assertNull( element, "Expected a null element" );
                 }
                 else
                 {
-                    assertNotNull( "The element for key [" + "key:" + test[i] + "] should not be null. i = " + i,
-                                   element );
-                    assertEquals( "Elements contents do not match expected", element.getVal(), expectedValue );
+                    assertNotNull( element,
+                                   "The element for key [" + "key:" + test[i] + "] should not be null. i = " + i );
+                    assertEquals( element.getVal(), expectedValue, "Elements contents do not match expected" );
                 }
             }
         }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexDiskCacheSizeUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexDiskCacheSizeUnitTest.java
index 7f783c863..23e933c9d 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexDiskCacheSizeUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexDiskCacheSizeUnitTest.java
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 
@@ -30,7 +30,7 @@
 import org.apache.commons.jcs3.auxiliary.disk.behavior.IDiskCacheAttributes.DiskLimitType;
 import org.apache.commons.jcs3.engine.CacheElement;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class IndexDiskCacheSizeUnitTest extends AbstractIndexDiskCacheUnitTest
 {
@@ -43,8 +43,8 @@ public IndexedDiskCacheAttributes getCacheAttributes()
 	}
 
     @Test
-    public void testRecycleBin()
-		        throws IOException
+    void testRecycleBin()
+        throws IOException
     {
         final IndexedDiskCacheAttributes cattr = getCacheAttributes();
         cattr.setCacheName( "testRemoveItems" );
@@ -98,13 +98,13 @@ public void testRecycleBin()
                 final String expectedValue = expect[i];
                 if ( expectedValue == null )
                 {
-                    assertNull( "Expected a null element", element );
+                    assertNull( element, "Expected a null element" );
                 }
                 else
                 {
-                    assertNotNull( "The element for key [" + "key:" + test[i] + "] should not be null. i = " + i,
-                                   element );
-                    assertEquals( "Elements contents do not match expected", element.getVal(), value );
+                    assertNotNull( element,
+                                   "The element for key [" + "key:" + test[i] + "] should not be null. i = " + i );
+                    assertEquals( element.getVal(), value, "Elements contents do not match expected" );
                 }
             }
         }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheConcurrentNoDeadLockUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheConcurrentNoDeadLockUnitTest.java
index f77fdc28f..7e04672c8 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheConcurrentNoDeadLockUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheConcurrentNoDeadLockUnitTest.java
@@ -19,13 +19,10 @@
  * under the License.
  */
 
-import junit.extensions.ActiveTestSuite;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
 import org.apache.commons.jcs3.JCS;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test which exercises the indexed disk cache. Runs three threads against the
@@ -33,83 +30,53 @@
  */
 public class IndexedDiskCacheConcurrentNoDeadLockUnitTest
 {
-    /**
-     * A unit test suite for JUnit
-     *
-     * @return The test suite
-     */
-    public static Test suite()
-    {
-        final ActiveTestSuite suite = new ActiveTestSuite();
 
-        suite.addTest(new TestCase("testIndexedDiskCache1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                IndexedDiskCacheRandomConcurrentTestUtil.runTestForRegion( "indexedRegion4", 1, 200, 1 );
-            }
-        });
-
-        suite.addTest(new TestCase("testIndexedDiskCache2" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                IndexedDiskCacheRandomConcurrentTestUtil.runTestForRegion( "indexedRegion4", 10000, 50000, 2 );
-            }
-        });
+    @BeforeEach
+    void setUp()
+    {
+        // Set the configuration file for the cache
+        JCS.setConfigFilename( "/TestDiskCacheCon.ccf" );
+    }
 
-        suite.addTest(new TestCase("testIndexedDiskCache3" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                IndexedDiskCacheRandomConcurrentTestUtil.runTestForRegion( "indexedRegion4", 10000, 50000, 3 );
-            }
-        });
+    @AfterEach
+    void tearDown()
+    {
+        // Dispose of the cache after each test
+        JCS.shutdown();
+    }
 
-        suite.addTest(new TestCase("testIndexedDiskCache4" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                IndexedDiskCacheRandomConcurrentTestUtil.runTestForRegion( "indexedRegion4", 10000, 50000, 4 );
-            }
-        });
+    @Test
+    void testIndexedDiskCache1()
+        throws Exception
+    {
+        IndexedDiskCacheRandomConcurrentTestUtil.runTestForRegion( "indexedRegion4", 1, 200, 1 );
+    }
 
-        suite.addTest(new TestCase("testIndexedDiskCache5" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                IndexedDiskCacheRandomConcurrentTestUtil.runTestForRegion( "indexedRegion4", 10000, 50000, 5 );
-            }
-        });
+    @Test
+    void testIndexedDiskCache2()
+        throws Exception
+    {
+        IndexedDiskCacheRandomConcurrentTestUtil.runTestForRegion( "indexedRegion4", 10000, 50000, 2 );
+    }
 
-        return suite;
+    @Test
+    void testIndexedDiskCache3()
+        throws Exception
+    {
+        IndexedDiskCacheRandomConcurrentTestUtil.runTestForRegion( "indexedRegion4", 10000, 50000, 3 );
     }
 
-    /**
-     * Test setup
-     */
-    @Before
-    public void setUp()
+    @Test
+    void testIndexedDiskCache4()
+        throws Exception
     {
-        JCS.setConfigFilename( "/TestDiskCacheCon.ccf" );
+        IndexedDiskCacheRandomConcurrentTestUtil.runTestForRegion( "indexedRegion4", 10000, 50000, 4 );
     }
 
-    /**
-     * Test tearDown. Dispose of the cache.
-     */
-    @After
-    public void tearDown()
+    @Test
+    void testIndexedDiskCache5()
+        throws Exception
     {
-        JCS.shutdown();
+        IndexedDiskCacheRandomConcurrentTestUtil.runTestForRegion( "indexedRegion4", 10000, 50000, 5 );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheConcurrentUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheConcurrentUnitTest.java
index 8e48c2752..c434f8c85 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheConcurrentUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheConcurrentUnitTest.java
@@ -19,41 +19,19 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.extensions.ActiveTestSuite;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test which exercises the indexed disk cache. This one uses three different
@@ -61,21 +39,18 @@
  */
 public class IndexedDiskCacheConcurrentUnitTest
 {
-    /**
-     * Number of items to cache, twice the configured maxObjects for the memory
-     * cache regions.
-     */
+
     private static final int items = 200;
 
+    @BeforeEach
+    void setUp()
+    {
+        // Configure JCS with the appropriate cache configuration file
+        JCS.setConfigFilename( "/TestDiskCache.ccf" );
+    }
+
     /**
-     * Adds items to cache, gets them, and removes them. The item count is more
-     * than the size of the memory cache, so items should spool to disk.
-     *
-     * @param region
-     *            Name of the region to access
-     *
-     * @throws Exception
-     *                If an error occurs
+     * Utility method to add, verify, and remove cache items for a given region.
      */
     public static void runTestForRegion( final String region )
         throws Exception
@@ -92,11 +67,10 @@ public static void runTestForRegion( final String region )
         for ( int i = 0; i < items; i++ )
         {
             final String value = jcs.get( i + ":key" );
-
             assertEquals( region + " data " + i, value );
         }
 
-        // Test that getElements returns all the expected values
+        // Verify that getElements returns all expected values
         final Set<String> keys = new HashSet<>();
         for ( int i = 0; i < items; i++ )
         {
@@ -107,8 +81,8 @@ public static void runTestForRegion( final String region )
         for ( int i = 0; i < items; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", region + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( region + " data " + i, element.getVal(), "value " + i + ":key" );
         }
 
         // Remove all the items
@@ -118,25 +92,15 @@ public static void runTestForRegion( final String region )
         }
 
         // Verify removal
-        // another thread may have inserted since
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key" + "\n stats " + jcs.getStats(), jcs
-                .get( i + ":key" ) );
+            assertNull( jcs.get( i + ":key" ),
+                        "Removed key should be null: " + i + ":key" + "\n stats " + jcs.getStats() );
         }
     }
 
     /**
-     * Adds items to cache, gets them, and removes them. The item count is more
-     * than the size of the memory cache, so items should spool to disk.
-     *
-     * @param region
-     *            Name of the region to access
-     * @param start
-     * @param end
-     *
-     * @throws Exception
-     *                If an error occurs
+     * Utility method to add, verify, and remove cache items for a given region in a range.
      */
     public static void runTestForRegionInRange( final String region, final int start, final int end )
         throws Exception
@@ -153,11 +117,10 @@ public static void runTestForRegionInRange( final String region, final int start
         for ( int i = start; i < end; i++ )
         {
             final String value = jcs.get( i + ":key" );
-
             assertEquals( region + " data " + i, value );
         }
 
-        // Test that getElements returns all the expected values
+        // Verify that getElements returns all expected values
         final Set<String> keys = new HashSet<>();
         for ( int i = start; i < end; i++ )
         {
@@ -168,8 +131,8 @@ public static void runTestForRegionInRange( final String region, final int start
         for ( int i = start; i < end; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", region + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( region + " data " + i, element.getVal(), "value " + i + ":key" );
         }
 
         // Remove all the items
@@ -178,75 +141,41 @@ public static void runTestForRegionInRange( final String region, final int start
             jcs.remove( i + ":key" );
         }
 
-//        System.out.println( jcs.getStats() );
-
         // Verify removal
-        // another thread may have inserted since
         for ( int i = start; i < end; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key " + "\n stats " + jcs.getStats(), jcs.get( i
-                + ":key" ) );
+            assertNull( jcs.get( i + ":key" ),
+                        "Removed key should be null: " + i + ":key" + "\n stats " + jcs.getStats() );
         }
     }
 
-    /**
-     * A unit test suite for JUnit
-     *
-     * @return The test suite
-     */
-    public static Test suite()
+    // Individual test methods for each region and range, based on the suite's original tests
+
+    @Test
+    void testIndexedDiskCache1()
+        throws Exception
     {
-        final ActiveTestSuite suite = new ActiveTestSuite();
+        runTestForRegion( "indexedRegion1" );
+    }
 
-        suite.addTest(new TestCase("testIndexedDiskCache1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion1" );
-            }
-        });
-
-        suite.addTest(new TestCase("testIndexedDiskCache2" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion2" );
-            }
-        });
-
-        suite.addTest(new TestCase("testIndexedDiskCache3" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion3" );
-            }
-        });
-
-        suite.addTest(new TestCase("testIndexedDiskCache4" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegionInRange( "indexedRegion3", 300, 600 );
-            }
-        });
-
-        return suite;
+    @Test
+    void testIndexedDiskCache2()
+        throws Exception
+    {
+        runTestForRegion( "indexedRegion2" );
     }
 
-    /**
-     * Test setup
-     */
-    @Before
-    public void setUp()
+    @Test
+    void testIndexedDiskCache3()
+        throws Exception
     {
-        JCS.setConfigFilename( "/TestDiskCache.ccf" );
+        runTestForRegion( "indexedRegion3" );
+    }
+
+    @Test
+    void testIndexedDiskCache4()
+        throws Exception
+    {
+        runTestForRegionInRange( "indexedRegion3", 300, 600 );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheDefragPerformanceTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheDefragPerformanceTest.java
index fa2ba2e66..facdda19b 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheDefragPerformanceTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheDefragPerformanceTest.java
@@ -25,12 +25,12 @@
 
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * This is for manually testing the defrag process.
  */
-public class IndexedDiskCacheDefragPerformanceTest
+class IndexedDiskCacheDefragPerformanceTest
 {
     /**
      * Resembles a cached image.
@@ -149,7 +149,7 @@ private static void runRealTimeOptimizationTest()
      * @throws Exception
      */
     @Test
-    public void testRealTimeOptimization()
+    void testRealTimeOptimization()
         throws Exception
     {
         System.out.println( LOG_DIVIDER );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheKeyStoreUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheKeyStoreUnitTest.java
index 59c808e4b..9c52a42a7 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheKeyStoreUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheKeyStoreUnitTest.java
@@ -1,5 +1,15 @@
 package org.apache.commons.jcs3.auxiliary.disk.indexed;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.apache.commons.jcs3.engine.CacheElement;
+import org.apache.commons.jcs3.engine.ElementAttributes;
+import org.apache.commons.jcs3.engine.behavior.ICacheElement;
+import org.apache.commons.jcs3.engine.behavior.IElementAttributes;
+import org.junit.jupiter.api.Test;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,20 +29,10 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.commons.jcs3.engine.CacheElement;
-import org.apache.commons.jcs3.engine.ElementAttributes;
-import org.apache.commons.jcs3.engine.behavior.ICacheElement;
-import org.apache.commons.jcs3.engine.behavior.IElementAttributes;
-import org.junit.Test;
-
 /**
  * Test store and load keys.
  */
-public class IndexedDiskCacheKeyStoreUnitTest
+class IndexedDiskCacheKeyStoreUnitTest
 {
 
     /**
@@ -43,7 +43,7 @@ public class IndexedDiskCacheKeyStoreUnitTest
      * @throws Exception
      */
     @Test
-    public void testOptiimize()
+    void testOptiimize()
         throws Exception
     {
         final IndexedDiskCacheAttributes cattr = new IndexedDiskCacheAttributes();
@@ -73,8 +73,8 @@ public void testOptiimize()
         disk.processUpdate( elementSetup );
 
         final ICacheElement<String, String> elementRet = disk.processGet( "key:" + "A" );
-        assertNotNull( "postsave, Should have received an element.", elementRet );
-        assertEquals( "postsave, element is wrong.", "data:" + "A", elementRet.getVal() );
+        assertNotNull( elementRet, "postsave, Should have received an element." );
+        assertEquals( "data:" + "A", elementRet.getVal(), "postsave, element is wrong." );
 
         disk.remove( "key:" + "A" );
 
@@ -83,14 +83,15 @@ public void testOptiimize()
         disk.optimizeFile(); //deoptimizeRealTime();
         final long postSize = disk.getDataFileSize();
 
-        assertTrue( "Should be smaller. postsize="+postSize+" preSize="+preSize, postSize < preSize );
-        assertEquals( "Should be the same size after optimization as before add and remove.", preAddRemoveSize, postSize );
+        assertTrue( postSize < preSize, "Should be smaller. postsize=" + postSize + " preSize=" + preSize );
+        assertEquals( preAddRemoveSize, postSize,
+                      "Should be the same size after optimization as before add and remove." );
 
         for ( int i = 0; i < cnt; i++ )
         {
             final ICacheElement<String, String> element = disk.processGet( "key:" + i );
-            assertNotNull( "postsave, Should have received an element.", element );
-            assertEquals( "postsave, element is wrong.", "data:" + i, element.getVal() );
+            assertNotNull( element, "postsave, Should have received an element." );
+            assertEquals( "data:" + i, element.getVal(), "postsave, element is wrong." );
         }
     }
 
@@ -101,7 +102,7 @@ public void testOptiimize()
      * @throws Exception
      */
     @Test
-    public void testStoreKeys()
+    void testStoreKeys()
         throws Exception
     {
         final IndexedDiskCacheAttributes cattr = new IndexedDiskCacheAttributes();
@@ -125,21 +126,21 @@ public void testStoreKeys()
         for ( int i = 0; i < cnt; i++ )
         {
             final ICacheElement<String, String> element = disk.processGet( "key:" + i );
-            assertNotNull( "presave, Should have received an element.", element );
-            assertEquals( "presave, element is wrong.", "data:" + i, element.getVal() );
+            assertNotNull( element, "presave, Should have received an element." );
+            assertEquals( "data:" + i, element.getVal(), "presave, element is wrong." );
         }
 
         disk.saveKeys();
 
         disk.loadKeys();
 
-        assertEquals( "The disk is the wrong size.", cnt, disk.getSize() );
+        assertEquals( cnt, disk.getSize(), "The disk is the wrong size." );
 
         for ( int i = 0; i < cnt; i++ )
         {
             final ICacheElement<String, String> element = disk.processGet( "key:" + i );
-            assertNotNull( "postsave, Should have received an element.", element );
-            assertEquals( "postsave, element is wrong.", "data:" + i, element.getVal() );
+            assertNotNull( element, "postsave, Should have received an element." );
+            assertEquals( "data:" + i, element.getVal(), "postsave, element is wrong." );
         }
 
         disk.dump();
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheNoMemoryUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheNoMemoryUnitTest.java
index dfacb730b..eccf97c80 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheNoMemoryUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheNoMemoryUnitTest.java
@@ -19,21 +19,19 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import junit.extensions.ActiveTestSuite;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test which exercises the indexed disk cache. This one uses three different
@@ -42,21 +40,20 @@
  */
 public class IndexedDiskCacheNoMemoryUnitTest
 {
+
+    private static final int items = 2000;
+
     /**
-     * Number of items to cache; the configured maxObjects for the memory cache
-     * regions is 0.
+     * Configure JCS cache settings before each test
      */
-    private static final int items = 2000;
+    @BeforeEach
+    void setUp()
+    {
+        JCS.setConfigFilename( "/TestDiskCacheNoMemory.ccf" );
+    }
 
     /**
-     * Adds items to cache, gets them, and removes them. The item count is more
-     * than the size of the memory cache, so items should spool to disk.
-     *
-     * @param region
-     *            Name of the region to access
-     *
-     * @throws Exception
-     *                If an error occurs
+     * Utility method to test caching, retrieving, and removal for a given cache region.
      */
     protected static void runTestForRegion( final String region )
         throws Exception
@@ -64,22 +61,19 @@ protected static void runTestForRegion( final String region )
         final CacheAccess<String, String> jcs = JCS.getInstance( region );
 
         // Add items to cache
-
         for ( int i = 0; i < items; i++ )
         {
             jcs.put( i + ":key", region + " data " + i );
         }
 
         // Test that all items are in cache
-
         for ( int i = 0; i < items; i++ )
         {
             final String value = jcs.get( i + ":key" );
-
             assertEquals( region + " data " + i, value );
         }
 
-        // Test that getElements returns all the expected values
+        // Verify getElements returns all expected values
         final Set<String> keys = new HashSet<>();
         for ( int i = 0; i < items; i++ )
         {
@@ -90,8 +84,8 @@ protected static void runTestForRegion( final String region )
         for ( int i = 0; i < items; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", region + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( region + " data " + i, element.getVal(), "value " + i + ":key" );
         }
 
         // Remove all the items
@@ -103,53 +97,31 @@ protected static void runTestForRegion( final String region )
         // Verify removal
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key" + "\n stats " + jcs.getStats(), jcs.get( i + ":key" ) );
+            assertNull( jcs.get( i + ":key" ),
+                        "Removed key should be null: " + i + ":key" + "\n stats " + jcs.getStats() );
         }
+    }
+
+    // Individual test methods for each region based on original suite's test cases
 
-        // dump the stats to the report
-//        System.out.println( jcs.getStats() );
+    @Test
+    void testIndexedDiskCache1()
+        throws Exception
+    {
+        runTestForRegion( "indexedRegion1" );
     }
 
-    /**
-     * A unit test suite for JUnit
-     * <p>
-     * @return The test suite
-     */
-    public static Test suite()
+    @Test
+    void testIndexedDiskCache2()
+        throws Exception
     {
-        JCS.setConfigFilename( "/TestDiskCacheNoMemory.ccf" );
-        final ActiveTestSuite suite = new ActiveTestSuite();
+        runTestForRegion( "indexedRegion2" );
+    }
 
-        suite.addTest(new TestCase("testIndexedDiskCache1")
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion1" );
-            }
-        });
-
-        suite.addTest(new TestCase("testIndexedDiskCache2")
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion2" );
-            }
-        });
-
-        suite.addTest(new TestCase("testIndexedDiskCache3")
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion3" );
-            }
-        });
-
-        return suite;
+    @Test
+    void testIndexedDiskCache3()
+        throws Exception
+    {
+        runTestForRegion( "indexedRegion3" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java
index 5ab1f3e0b..937410af4 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java
@@ -1,5 +1,13 @@
 package org.apache.commons.jcs3.auxiliary.disk.indexed;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.apache.commons.jcs3.auxiliary.disk.DiskTestObject;
+import org.apache.commons.jcs3.engine.behavior.ICacheElement;
+import org.apache.commons.jcs3.utils.timing.SleepUtil;
+import org.junit.jupiter.api.Test;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,18 +27,10 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.commons.jcs3.auxiliary.disk.DiskTestObject;
-import org.apache.commons.jcs3.engine.behavior.ICacheElement;
-import org.apache.commons.jcs3.utils.timing.SleepUtil;
-import org.junit.Test;
-
 /**
  * Tests for the optimization routine.
  */
-public class IndexedDiskCacheOptimizationUnitTest
+class IndexedDiskCacheOptimizationUnitTest
 {
     /**
      * Sets the optimize at remove count to 10. Add 20. Check the file size. Remove 10. Check the
@@ -38,7 +38,7 @@ public class IndexedDiskCacheOptimizationUnitTest
      * @throws Exception
      */
     @Test
-    public void testBasicOptimization()
+    void testBasicOptimization()
         throws Exception
     {
         // SETUP
@@ -85,9 +85,8 @@ public void testBasicOptimization()
             SleepUtil.sleepAtLeast( 2000 );
         }
 
-        assertTrue( "The post optimization size should be smaller."
-                +"sizeAfterRemove=" + sizeAfterRemove + " sizeBeforeRemove= " +sizeBeforeRemove
-                , sizeAfterRemove < sizeBeforeRemove );
-        assertEquals( "The file size is not as expected size.", expectedSizeAfterRemove, sizeAfterRemove );
+        assertTrue( sizeAfterRemove < sizeBeforeRemove, "The post optimization size should be smaller."
+            + "sizeAfterRemove=" + sizeAfterRemove + " sizeBeforeRemove= " + sizeBeforeRemove );
+        assertEquals( expectedSizeAfterRemove, sizeAfterRemove, "The file size is not as expected size." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheRandomConcurrentTestUtil.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheRandomConcurrentTestUtil.java
index 0a519fd35..ada697e19 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheRandomConcurrentTestUtil.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheRandomConcurrentTestUtil.java
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheSameRegionConcurrentUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheSameRegionConcurrentUnitTest.java
index e42ee5fe0..27fc74bfc 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheSameRegionConcurrentUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheSameRegionConcurrentUnitTest.java
@@ -1,8 +1,5 @@
 package org.apache.commons.jcs3.auxiliary.disk.indexed;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,17 +19,18 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import junit.extensions.ActiveTestSuite;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test which exercises the indexed disk cache. Runs three threads against the
@@ -40,17 +38,23 @@
  */
 public class IndexedDiskCacheSameRegionConcurrentUnitTest
 {
+
     /**
-     * Adds items to cache, gets them, and removes them. The item count is more
-     * than the size of the memory cache, so items should spool to disk.
-     *
-     * @param region
-     *            Name of the region to access
-     * @param start
-     * @param end
+     * Sets the cache configuration before each test.
+     */
+    @BeforeEach
+    void setUp()
+    {
+        JCS.setConfigFilename( "/TestDiskCacheCon.ccf" );
+    }
+
+    /**
+     * Method to test caching, retrieval, and verification for a specific cache region and item range.
      *
-     * @throws Exception
-     *                If an error occurs
+     * @param region Name of the cache region
+     * @param start  Starting index of items
+     * @param end    Ending index of items
+     * @throws Exception If an error occurs during cache access
      */
     public static void runTestForRegion( final String region, final int start, final int end )
         throws Exception
@@ -58,23 +62,20 @@ public static void runTestForRegion( final String region, final int start, final
         final CacheAccess<String, String> jcs = JCS.getInstance( region );
 
         // Add items to cache
-
         for ( int i = start; i < end; i++ )
         {
             jcs.put( i + ":key", region + " data " + i );
         }
 
-        // Test that all items are in cache
-
+        // Verify that all items are in cache
         for ( int i = start; i < end; i++ )
         {
             final String key = i + ":key";
             final String value = jcs.get( key );
-
-            assertEquals( "Wrong value for key [" + key + "]", region + " data " + i, value );
+            assertEquals( region + " data " + i, value, "Wrong value for key [" + key + "]" );
         }
 
-        // Test that getElements returns all the expected values
+        // Verify that getElements returns all expected values
         final Set<String> keys = new HashSet<>();
         for ( int i = start; i < end; i++ )
         {
@@ -85,98 +86,43 @@ public static void runTestForRegion( final String region, final int start, final
         for ( int i = start; i < end; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", region + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( region + " data " + i, element.getVal(), "value " + i + ":key" );
         }
+    }
 
-        // you can't remove in one thread and expect them to be in another //
-        //          Remove all the items
-        //
-        //          for ( int i = start; i < end; i++ ) { jcs.remove( i + ":key" ); } //
-        //          Verify removal
-        //
-        //          for ( int i = start; i < end; i++ ) { assertNull( "Removed key
-        //          should be null: " + i + ":key", jcs.get( i + ":key" ) ); }
+    @Test
+    void testIndexedDiskCache1()
+        throws Exception
+    {
+        runTestForRegion( "indexedRegion4", 0, 200 );
     }
 
-    // /**
-    // * Tests the region which uses the indexed disk cache
-    // */
-    // public void testIndexedDiskCache()
-    // throws Exception
-    // {
-    // runTestForRegion( "indexedRegion" );
-    // }
-    //
-    // /**
-    // * Tests the region which uses the indexed disk cache
-    // */
-    // public void testIndexedDiskCache2()
-    // throws Exception
-    // {
-    // runTestForRegion( "indexedRegion2" );
-    // }
+    @Test
+    void testIndexedDiskCache2()
+        throws Exception
+    {
+        runTestForRegion( "indexedRegion4", 1000, 1200 );
+    }
 
-    /**
-     * A unit test suite for JUnit
-     *
-     * @return The test suite
-     */
-    public static Test suite()
+    @Test
+    void testIndexedDiskCache3()
+        throws Exception
     {
-        JCS.setConfigFilename( "/TestDiskCacheCon.ccf" );
-        final ActiveTestSuite suite = new ActiveTestSuite();
+        runTestForRegion( "indexedRegion4", 2000, 2200 );
+    }
 
-        suite.addTest(new TestCase("testIndexedDiskCache1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion4", 0, 200 );
-            }
-        });
-
-        suite.addTest(new TestCase("testIndexedDiskCache2" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion4", 1000, 1200 );
-            }
-        });
-
-        suite.addTest(new TestCase("testIndexedDiskCache3" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion4", 2000, 2200 );
-            }
-        });
-
-        suite.addTest(new TestCase("testIndexedDiskCache4" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion4", 2200, 5200 );
-            }
-        });
-
-        suite.addTest(new TestCase("testIndexedDiskCache5" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion4", 0, 5100 );
-            }
-        });
-
-        return suite;
+    @Test
+    void testIndexedDiskCache4()
+        throws Exception
+    {
+        runTestForRegion( "indexedRegion4", 2200, 5200 );
+    }
+
+    @Test
+    void testIndexedDiskCache5()
+        throws Exception
+    {
+        runTestForRegion( "indexedRegion4", 0, 5100 );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheSteadyLoadTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheSteadyLoadTest.java
index 48e40b8cc..773a31906 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheSteadyLoadTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheSteadyLoadTest.java
@@ -26,13 +26,13 @@
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.auxiliary.disk.DiskTestObject;
 import org.apache.commons.jcs3.utils.timing.ElapsedTimer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * This allows you to put thousands of large objects into the disk cache and to force removes to
  * trigger optimizations along the way.
  */
-public class IndexedDiskCacheSteadyLoadTest
+class IndexedDiskCacheSteadyLoadTest
 {
     /** For display */
     private static final String LOG_DIVIDER = "---------------------------";
@@ -63,7 +63,7 @@ private static void logMemoryUsage()
      * @throws Exception
      */
     @Test
-    public void testRunSteadyLoadTest()
+    void testRunSteadyLoadTest()
         throws Exception
     {
         JCS.setConfigFilename( "/TestDiskCacheSteadyLoad.ccf" );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/LRUMapSizeVsCount.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/LRUMapSizeVsCount.java
index 9692e2c7a..c566faafc 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/LRUMapSizeVsCount.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/LRUMapSizeVsCount.java
@@ -19,11 +19,11 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * This ensures that the jcs version of the LRU map is as fast as the commons
@@ -193,7 +193,7 @@ public void doWork()
      *                Description of the Exception
      */
     @Test
-    public void testSimpleLoad()
+    void testSimpleLoad()
         throws Exception
     {
         doWork();
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDataSourceFactoryUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDataSourceFactoryUnitTest.java
index 2b3ee7ffe..17d8aa5a8 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDataSourceFactoryUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDataSourceFactoryUnitTest.java
@@ -19,9 +19,9 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.sql.SQLException;
 import java.util.HashMap;
@@ -39,10 +39,10 @@
 import org.apache.commons.jcs3.auxiliary.disk.jdbc.dsfactory.DataSourceFactory;
 import org.apache.commons.jcs3.auxiliary.disk.jdbc.dsfactory.JndiDataSourceFactory;
 import org.apache.commons.jcs3.auxiliary.disk.jdbc.dsfactory.SharedPoolDataSourceFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the data source factories */
-public class JDBCDataSourceFactoryUnitTest
+class JDBCDataSourceFactoryUnitTest
 {
     /* For JNDI mocking */
     public static class MockInitialContextFactory implements InitialContextFactory
@@ -108,7 +108,8 @@ public Context getInitialContext(final Hashtable<?, ?> environment) throws Namin
      * @throws SQLException
      */
     @Test
-    public void testConfigureDataSourceFactory_Attributes() throws SQLException
+    void testConfigureDataSourceFactory_Attributes()
+        throws SQLException
     {
         // SETUP
         final String url = "adfads";
@@ -129,13 +130,13 @@ public void testConfigureDataSourceFactory_Attributes() throws SQLException
 
         // DO WORK
         final DataSourceFactory result = factory.getDataSourceFactory( cattr, null );
-        assertTrue("Should be a shared pool data source factory", result instanceof SharedPoolDataSourceFactory);
+        assertInstanceOf( SharedPoolDataSourceFactory.class, result, "Should be a shared pool data source factory" );
 
         final SharedPoolDataSource spds = (SharedPoolDataSource) result.getDataSource();
-        assertNotNull( "Should have a data source class", spds );
+        assertNotNull( spds, "Should have a data source class" );
 
         // VERIFY
-        assertEquals( "Wrong maxActive value", maxActive, spds.getMaxTotal() );
+        assertEquals( maxActive, spds.getMaxTotal(), "Wrong maxActive value" );
     }
 
     /**
@@ -143,7 +144,8 @@ public void testConfigureDataSourceFactory_Attributes() throws SQLException
      * @throws SQLException
      */
     @Test
-    public void testConfigureDataSourceFactory_JNDI() throws SQLException
+    void testConfigureDataSourceFactory_JNDI()
+        throws SQLException
     {
         // SETUP
         final String jndiPath = "java:comp/env/jdbc/MyDB";
@@ -163,7 +165,7 @@ public void testConfigureDataSourceFactory_JNDI() throws SQLException
 
         // DO WORK
         final DataSourceFactory result = factory.getDataSourceFactory( cattr, null );
-        assertTrue("Should be a JNDI data source factory", result instanceof JndiDataSourceFactory);
+        assertInstanceOf( JndiDataSourceFactory.class, result, "Should be a JNDI data source factory" );
     }
 
     /**
@@ -171,7 +173,8 @@ public void testConfigureDataSourceFactory_JNDI() throws SQLException
      * @throws SQLException
      */
     @Test
-    public void testConfigureDataSourceFactory_Simple() throws SQLException
+    void testConfigureDataSourceFactory_Simple()
+        throws SQLException
     {
         // SETUP
         final String poolName = "testConfigurePoolAccessAttributes_Simple";
@@ -200,14 +203,14 @@ public void testConfigureDataSourceFactory_Simple() throws SQLException
 
         // DO WORK
         final DataSourceFactory result = factory.getDataSourceFactory( cattr, props );
-        assertTrue("Should be a shared pool data source factory", result instanceof SharedPoolDataSourceFactory);
+        assertInstanceOf( SharedPoolDataSourceFactory.class, result, "Should be a shared pool data source factory" );
 
         final SharedPoolDataSource spds = (SharedPoolDataSource) result.getDataSource();
-        assertNotNull( "Should have a data source class", spds );
+        assertNotNull( spds, "Should have a data source class" );
 
         // VERIFY
-        assertEquals( "Wrong pool name", poolName, spds.getDescription() );
-        assertEquals( "Wrong maxActive value", maxActive, spds.getMaxTotal() );
+        assertEquals( poolName, spds.getDescription(), "Wrong pool name" );
+        assertEquals( maxActive, spds.getMaxTotal(), "Wrong maxActive value" );
     }
 }
 
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java
index 7034a5f73..5f19530bb 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java
@@ -19,19 +19,19 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.sql.Connection;
 import java.util.Properties;
 
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the removal functionality. */
-public class JDBCDiskCacheRemovalUnitTest
+class JDBCDiskCacheRemovalUnitTest
 {
     /** Db name -- set in system props */
     private final String databaseName = "JCS_STORE_REMOVAL";
@@ -40,8 +40,9 @@ public class JDBCDiskCacheRemovalUnitTest
      * Test setup
      * @throws Exception
      */
-    @Before
-    public void setUp() throws Exception
+    @BeforeEach
+    void setUp()
+        throws Exception
     {
         System.setProperty( "DATABASE_NAME", databaseName );
         JCS.setConfigFilename( "/TestJDBCDiskCacheRemoval.ccf" );
@@ -58,7 +59,7 @@ public void setUp() throws Exception
      * @throws Exception
      */
     @Test
-    public void testPartialKeyRemoval_Good()
+    void testPartialKeyRemoval_Good()
         throws Exception
     {
         // SETUP
@@ -75,11 +76,11 @@ public void testPartialKeyRemoval_Good()
 
         // VERIFY
         final String resultBeforeRemove = jcs.get( keyPart1 + ":" + keyPart2 );
-        assertEquals( "Wrong result", data, resultBeforeRemove );
+        assertEquals( data, resultBeforeRemove, "Wrong result" );
 
         jcs.remove( keyPart1 + ":" );
         final String resultAfterRemove = jcs.get( keyPart1 + ":" + keyPart2 );
-        assertNull( "Should not have a result after removal.", resultAfterRemove );
+        assertNull( resultAfterRemove, "Should not have a result after removal." );
 
 //        System.out.println( jcs.getStats() );
     }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheSharedPoolUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheSharedPoolUnitTest.java
index ac6ced8a0..1b1ea882b 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheSharedPoolUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheSharedPoolUnitTest.java
@@ -19,9 +19,9 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.sql.Connection;
 import java.util.HashSet;
@@ -32,8 +32,8 @@
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Runs basic tests for the JDBC disk cache using a shared connection pool.
@@ -69,7 +69,7 @@ public static void runTestForRegion( final String region, final int items )
         {
             final String value = jcs.get( i + ":key" );
 
-            assertEquals( "key = [" + i + ":key] value = [" + value + "]", region + " data " + i, value );
+            assertEquals( region + " data " + i, value, "key = [" + i + ":key] value = [" + value + "]" );
         }
 
         // Test that getElements returns all the expected values
@@ -83,8 +83,8 @@ public static void runTestForRegion( final String region, final int items )
         for ( int i = 0; i < items; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", region + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( region + " data " + i, element.getVal(), "value " + i + ":key" );
         }
 
         // Remove all the items
@@ -96,15 +96,16 @@ public static void runTestForRegion( final String region, final int items )
         // Verify removal
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key", jcs.get( i + ":key" ) );
+            assertNull( jcs.get( i + ":key" ), "Removed key should be null: " + i + ":key" );
         }
     }
 
     /** Test setup
      * @throws Exception
      */
-    @Before
-    public void setUp() throws Exception
+    @BeforeEach
+    void setUp()
+        throws Exception
     {
         JCS.setConfigFilename( "/TestJDBCDiskCacheSharedPool.ccf" );
         try (Connection con = HsqlSetupUtil.getTestDatabaseConnection(new Properties(), "cache_hsql_db_sharedpool"))
@@ -119,7 +120,7 @@ public void setUp() throws Exception
      * @throws Exception
      */
     @Test
-    public void testSimpleJDBCPutGetWithHSQL()
+    void testSimpleJDBCPutGetWithHSQL()
         throws Exception
     {
         runTestForRegion( "testCache1", 200 );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java
index e210a158d..80e1cb66f 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java
@@ -1,5 +1,18 @@
 package org.apache.commons.jcs3.auxiliary.disk.jdbc;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.sql.Connection;
+import java.util.Properties;
+
+import org.apache.commons.jcs3.JCS;
+import org.apache.commons.jcs3.access.CacheAccess;
+import org.apache.commons.jcs3.access.exception.CacheException;
+import org.apache.commons.jcs3.utils.timing.SleepUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,30 +32,18 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.sql.Connection;
-import java.util.Properties;
-
-import org.apache.commons.jcs3.JCS;
-import org.apache.commons.jcs3.access.CacheAccess;
-import org.apache.commons.jcs3.access.exception.CacheException;
-import org.apache.commons.jcs3.utils.timing.SleepUtil;
-import org.junit.Before;
-import org.junit.Test;
-
 /**
  * Runs basic tests for the JDBC disk cache.
  */
-public class JDBCDiskCacheShrinkUnitTest
+class JDBCDiskCacheShrinkUnitTest
 {
     /**
      * Test setup
      * @throws Exception
      */
-    @Before
-    public void setUp() throws Exception
+    @BeforeEach
+    void setUp()
+        throws Exception
     {
         JCS.setConfigFilename( "/TestJDBCDiskCacheShrink.ccf" );
         try (Connection con = HsqlSetupUtil.getTestDatabaseConnection(new Properties(), getClass().getSimpleName()))
@@ -58,7 +59,7 @@ public void setUp() throws Exception
      * @throws InterruptedException
      */
     @Test
-    public void testDidNotExpire()
+    void testDidNotExpire()
         throws CacheException, InterruptedException
     {
         final String region = "expire100Second";
@@ -79,7 +80,7 @@ public void testDidNotExpire()
         {
             final String value = jcs.get( i + ":key" );
 
-            assertEquals( "key = [" + i + ":key] value = [" + value + "]", region + " data " + i, value );
+            assertEquals( region + " data " + i, value, "key = [" + i + ":key] value = [" + value + "]" );
         }
 
         // Remove all the items
@@ -91,7 +92,7 @@ public void testDidNotExpire()
         // Verify removal
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key", jcs.get( i + ":key" ) );
+            assertNull( jcs.get( i + ":key" ), "Removed key should be null: " + i + ":key" );
         }
     }
 
@@ -101,7 +102,7 @@ public void testDidNotExpire()
      * @throws InterruptedException
      */
     @Test
-    public void testDidNotExpireEternal()
+    void testDidNotExpireEternal()
         throws CacheException, InterruptedException
     {
         final String region = "eternal";
@@ -122,7 +123,7 @@ public void testDidNotExpireEternal()
         {
             final String value = jcs.get( i + ":key" );
 
-            assertEquals( "key = [" + i + ":key] value = [" + value + "]", region + " data " + i, value );
+            assertEquals( region + " data " + i, value, "key = [" + i + ":key] value = [" + value + "]" );
         }
 
         // Remove all the items
@@ -134,7 +135,7 @@ public void testDidNotExpireEternal()
         // Verify removal
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key", jcs.get( i + ":key" ) );
+            assertNull( jcs.get( i + ":key" ), "Removed key should be null: " + i + ":key" );
         }
     }
 
@@ -145,7 +146,7 @@ public void testDidNotExpireEternal()
      * @throws Exception
      */
     @Test
-    public void testExpireInBackground()
+    void testExpireInBackground()
         throws Exception
     {
         final String regionExpire = "expire1Second";
@@ -165,7 +166,7 @@ public void testExpireInBackground()
         // Test that all items have been removed from the cache
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key", jcsExpire.get( i + ":key" ) );
+            assertNull( jcsExpire.get( i + ":key" ), "Removed key should be null: " + i + ":key" );
         }
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheUnitTest.java
index 8a534bcba..707516ddf 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheUnitTest.java
@@ -19,9 +19,9 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.sql.Connection;
 import java.util.HashSet;
@@ -37,8 +37,8 @@
 import org.apache.commons.jcs3.engine.control.MockCompositeCacheManager;
 import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
 import org.apache.commons.jcs3.utils.threadpool.DaemonThreadFactory;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Runs basic tests for the JDBC disk cache.
@@ -71,7 +71,7 @@ public static void runTestForRegion( final String region, final int items )
         {
             final String value = jcs.get( i + ":key" );
 
-            assertEquals( "key = [" + i + ":key] value = [" + value + "]", region + " data " + i, value );
+            assertEquals( region + " data " + i, value, "key = [" + i + ":key] value = [" + value + "]" );
         }
 
         // Test that getElements returns all the expected values
@@ -85,8 +85,8 @@ public static void runTestForRegion( final String region, final int items )
         for ( int i = 0; i < items; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", region + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( region + " data " + i, element.getVal(), "value " + i + ":key" );
         }
 
         // Remove all the items
@@ -98,13 +98,13 @@ public static void runTestForRegion( final String region, final int items )
         // Verify removal
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key", jcs.get( i + ":key" ) );
+            assertNull( jcs.get( i + ":key" ), "Removed key should be null: " + i + ":key" );
         }
     }
 
     /** Test setup */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
     {
         JCS.setConfigFilename( "/TestJDBCDiskCache.ccf" );
     }
@@ -115,7 +115,7 @@ public void setUp()
      * @throws Exception
      */
     @Test
-    public void testInitializePoolAccess_withPoolName()
+    void testInitializePoolAccess_withPoolName()
         throws Exception
     {
         // SETUP
@@ -144,14 +144,14 @@ public void testInitializePoolAccess_withPoolName()
         	new DaemonThreadFactory("JCS-JDBCDiskCacheManager-", Thread.MIN_PRIORITY)));
 
         final JDBCDiskCache<String, String> diskCache = dcFactory.createCache( cattr, compositeCacheManager, null, new StandardSerializer() );
-        assertNotNull( "Should have a cache instance", diskCache );
+        assertNotNull( diskCache, "Should have a cache instance" );
 
         // DO WORK
         final DataSourceFactory result = dcFactory.getDataSourceFactory(cattr, props);
 
         // VERIFY
-        assertNotNull( "Should have a data source factory class", result );
-        assertEquals( "wrong name", poolName, result.getName() );
+        assertNotNull( result, "Should have a data source factory class" );
+        assertEquals( poolName, result.getName(), "wrong name" );
 
         // Disable this test: it's not clear what it is trying to check. Also it causes an Error when re-running tests:
         // JDBCDiskCacheUnitTest.testInitializePoolAccess_withPoolName:157 » SQL Table already exists:
@@ -166,7 +166,7 @@ public void testInitializePoolAccess_withPoolName()
      * @throws Exception
      */
     @Test
-    public void testSimpleJDBCPutGetWithHSQL()
+    void testSimpleJDBCPutGetWithHSQL()
         throws Exception
     {
         try (Connection con = HsqlSetupUtil.getTestDatabaseConnection(new Properties(), "cache_hsql_db"))
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java
index a6183df08..acd63af21 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java
@@ -1,13 +1,5 @@
 package org.apache.commons.jcs3.auxiliary.disk.jdbc.hsql;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -27,14 +19,19 @@
  * under the License.
  */
 
-import junit.extensions.ActiveTestSuite;
-import junit.framework.Test;
-import junit.framework.TestCase;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test which exercises the indexed disk cache. This one uses three different regions for thre
@@ -42,17 +39,26 @@
  */
 public class HSQLDiskCacheConcurrentUnitTest
 {
+
     /**
      * Number of items to cache, twice the configured maxObjects for the memory cache regions.
      */
     private static final int items = 100;
 
     /**
-     * Adds items to cache, gets them, and removes them. The item count is more than the size of the
-     * memory cache, so items should spool to disk.
-     * <p>
-     * @param region Name of the region to access
-     * @throws Exception If an error occurs
+     * Setup method for JUnit 5, executed before each test.
+     */
+    @BeforeEach
+    void setUp()
+    {
+        JCS.setConfigFilename( "/TestHSQLDiskCacheConcurrent.ccf" );
+    }
+
+    /**
+     * Runs the test for a given cache region.
+     *
+     * @param region The region name for the cache
+     * @throws Exception If an error occurs during cache access
      */
     public static void runTestForRegion( final String region )
         throws Exception
@@ -69,11 +75,10 @@ public static void runTestForRegion( final String region )
         for ( int i = 0; i < items; i++ )
         {
             final String value = jcs.get( i + ":key" );
-
-            assertEquals( "key = [" + i + ":key] value = [" + value + "]", region + " data " + i, value );
+            assertEquals( region + " data " + i, value, "key = [" + i + ":key] value = [" + value + "]" );
         }
 
-        // Test that getElements returns all the expected values
+        // Verify that getElements returns all expected values
         final Set<String> keys = new HashSet<>();
         for ( int i = 0; i < items; i++ )
         {
@@ -84,8 +89,8 @@ public static void runTestForRegion( final String region )
         for ( int i = 0; i < items; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", region + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( region + " data " + i, element.getVal(), "value " + i + ":key" );
         }
 
         // Remove all the items
@@ -97,58 +102,28 @@ public static void runTestForRegion( final String region )
         // Verify removal
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key", jcs.get( i + ":key" ) );
+            assertNull( jcs.get( i + ":key" ), "Removed key should be null: " + i + ":key" );
         }
     }
 
-    /**
-     * A unit test suite for JUnit. Uses ActiveTestSuite to run multiple tests concurrently.
-     * <p>
-     * @return The test suite
-     */
-    public static Test suite()
+    @Test
+    void testHSQLDiskCache1()
+        throws Exception
     {
-        final ActiveTestSuite suite = new ActiveTestSuite();
+        runTestForRegion( "indexedRegion1" );
+    }
 
-        suite.addTest(new TestCase("testHSQLDiskCache1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion1" );
-            }
-        });
-
-        suite.addTest(new TestCase("testHSQLDiskCache2" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion2" );
-            }
-        });
-
-        suite.addTest(new TestCase("testHSQLDiskCache3" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion3" );
-            }
-        });
-
-        return suite;
+    @Test
+    void testHSQLDiskCache2()
+        throws Exception
+    {
+        runTestForRegion( "indexedRegion2" );
     }
 
-    /**
-     * Test setup
-     */
-    @Before
-    public void setUp()
+    @Test
+    void testHSQLDiskCache3()
+        throws Exception
     {
-        JCS.setConfigFilename( "/TestHSQLDiskCacheConcurrent.ccf" );
+        runTestForRegion( "indexedRegion3" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/hsql/HSQLDiskCacheUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/hsql/HSQLDiskCacheUnitTest.java
index b3a4197fa..dbe22a539 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/hsql/HSQLDiskCacheUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/hsql/HSQLDiskCacheUnitTest.java
@@ -19,9 +19,9 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -31,19 +31,19 @@
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.access.exception.CacheException;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test which exercises the HSQL cache.
  */
-public class HSQLDiskCacheUnitTest
+class HSQLDiskCacheUnitTest
 {
     /**
      * Test setup
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
     {
         JCS.setConfigFilename( "/TestHSQLDiskCache.ccf" );
     }
@@ -55,7 +55,7 @@ public void setUp()
      * @throws Exception If an error occurs
      */
     @Test
-    public void testBasicPutRemove()
+    void testBasicPutRemove()
         throws Exception
     {
         final int items = 20;
@@ -74,7 +74,7 @@ public void testBasicPutRemove()
         for ( int i = 0; i < items; i++ )
         {
             final String value = jcs.get( i + ":key" );
-            assertEquals( "key = [" + i + ":key] value = [" + value + "]", region + " data " + i, value );
+            assertEquals( region + " data " + i, value, "key = [" + i + ":key] value = [" + value + "]" );
         }
 
         // Test that getElements returns all the expected values
@@ -88,8 +88,8 @@ public void testBasicPutRemove()
         for ( int i = 0; i < items; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", region + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( region + " data " + i, element.getVal(), "value " + i + ":key" );
         }
 
         // Remove all the items
@@ -101,7 +101,7 @@ public void testBasicPutRemove()
         // Verify removal
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key", jcs.get( i + ":key" ) );
+            assertNull( jcs.get( i + ":key" ), "Removed key should be null: " + i + ":key" );
         }
     }
 
@@ -112,7 +112,7 @@ public void testBasicPutRemove()
      * @throws InterruptedException
      */
     @Test
-    public void testRemoveAll()
+    void testRemoveAll()
         throws CacheException, InterruptedException
     {
         final String region = "removeAllAllowed";
@@ -140,7 +140,7 @@ public void testRemoveAll()
         for ( int i = 0; i < items; i++ )
         {
             final String value = jcs.get( i + ":key" );
-            assertNull( "value should be null key = [" + i + ":key] value = [" + value + "]", value );
+            assertNull( value, "value should be null key = [" + i + ":key] value = [" + value + "]" );
         }
     }
 
@@ -151,7 +151,7 @@ public void testRemoveAll()
      * @throws InterruptedException
      */
     @Test
-    public void testRemoveAllProhibition()
+    void testRemoveAllProhibition()
         throws CacheException, InterruptedException
     {
         final String region = "noRemoveAll";
@@ -173,7 +173,7 @@ public void testRemoveAllProhibition()
         for ( int i = 0; i < items; i++ )
         {
             final String value = jcs.get( i + ":key" );
-            assertEquals( "key = [" + i + ":key] value = [" + value + "]", region + " data " + i, value );
+            assertEquals( region + " data " + i, value, "key = [" + i + ":key] value = [" + value + "]" );
         }
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java
index 4f39fff46..5aa8e3701 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java
@@ -19,9 +19,9 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.sql.Connection;
 import java.util.HashSet;
@@ -33,8 +33,8 @@
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.auxiliary.disk.jdbc.HsqlSetupUtil;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Runs basic tests for the JDBC disk cache.
@@ -67,7 +67,7 @@ public static void runTestForRegion( final String region, final int items )
         {
             final String value = jcs.get( i + ":key" );
 
-            assertEquals( "key = [" + i + ":key] value = [" + value + "]", region + " data " + i, value );
+            assertEquals( region + " data " + i, value, "key = [" + i + ":key] value = [" + value + "]" );
         }
 
         // Test that getElements returns all the expected values
@@ -81,8 +81,8 @@ public static void runTestForRegion( final String region, final int items )
         for ( int i = 0; i < items; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", region + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( region + " data " + i, element.getVal(), "value " + i + ":key" );
         }
 
         // Remove all the items
@@ -94,7 +94,7 @@ public static void runTestForRegion( final String region, final int items )
         // Verify removal
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key", jcs.get( i + ":key" ) );
+            assertNull( jcs.get( i + ":key" ), "Removed key should be null: " + i + ":key" );
         }
     }
 
@@ -102,8 +102,9 @@ public static void runTestForRegion( final String region, final int items )
      * Test setup
      * @throws Exception
      */
-    @Before
-    public void setUp() throws Exception
+    @BeforeEach
+    void setUp()
+        throws Exception
     {
         JCS.setConfigFilename( "/TestMySQLDiskCache.ccf" );
         try (Connection con = HsqlSetupUtil.getTestDatabaseConnection(new Properties(), getClass().getSimpleName()))
@@ -118,7 +119,7 @@ public void setUp() throws Exception
      * @throws Exception
      */
     @Test
-    public void testPutGetMatchingWithHSQL()
+    void testPutGetMatchingWithHSQL()
         throws Exception
     {
         // SETUP
@@ -136,7 +137,7 @@ public void testPutGetMatchingWithHSQL()
         final Map<String, ICacheElement<String, String>> matchingResults = jcs.getMatchingCacheElements( "1.8.+" );
 
         // VERIFY
-        assertEquals( "Wrong number returned", 10, matchingResults.size() );
+        assertEquals( 10, matchingResults.size(), "Wrong number returned" );
 //        System.out.println( "matchingResults.keySet() " + matchingResults.keySet() );
     }
 
@@ -145,7 +146,7 @@ public void testPutGetMatchingWithHSQL()
      * @throws Exception
      */
     @Test
-    public void testSimpleJDBCPutGetWithHSQL()
+    void testSimpleJDBCPutGetWithHSQL()
         throws Exception
     {
         runTestForRegion( "testCache1", 200 );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheUnitTest.java
index 47324a185..5c37cca05 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheUnitTest.java
@@ -19,13 +19,13 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.sql.SQLException;
 
 import org.apache.commons.jcs3.auxiliary.disk.jdbc.TableState;
 import org.apache.commons.jcs3.auxiliary.disk.jdbc.dsfactory.SharedPoolDataSourceFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Simple tests for the MySQLDisk Cache.
@@ -33,7 +33,7 @@
  * We will probably need to setup an hsql behind this, to test some of the pass through methods.
  * </p>
  */
-public class MySQLDiskCacheUnitTest
+class MySQLDiskCacheUnitTest
 {
     /**
      * Verify that we simply return null on get if an optimization is in
@@ -45,7 +45,8 @@ public class MySQLDiskCacheUnitTest
      * @throws SQLException
      */
     @Test
-    public void testBalkOnGet() throws SQLException
+    void testBalkOnGet()
+        throws SQLException
     {
         // SETUP
         final MySQLDiskCacheAttributes attributes = new MySQLDiskCacheAttributes();
@@ -66,6 +67,6 @@ public void testBalkOnGet() throws SQLException
         final Object result = cache.processGet( "myKey" );
 
         // VERIFY
-        assertNull( "The result should be null", result );
+        assertNull( result, "The result should be null" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/util/ScheduleParserUtilUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/util/ScheduleParserUtilUnitTest.java
index 4fd3c4bb1..b3d0252c9 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/util/ScheduleParserUtilUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/util/ScheduleParserUtilUnitTest.java
@@ -19,25 +19,25 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.text.ParseException;
 import java.util.Date;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the schedule parser.
  */
-public class ScheduleParserUtilUnitTest
+class ScheduleParserUtilUnitTest
 {
 
     /**
      * Verify that we get an exception for a schedule that has a non numeric item.
      */
     @Test
-    public void testGetDatesMalformedNan()
+    void testGetDatesMalformedNan()
     {
         try
         {
@@ -56,7 +56,7 @@ public void testGetDatesMalformedNan()
      * Verify that we get an exception for a single bad date in a list.
      */
     @Test
-    public void testGetDatesMalformedNoColon()
+    void testGetDatesMalformedNoColon()
     {
         try
         {
@@ -75,7 +75,7 @@ public void testGetDatesMalformedNoColon()
      * Verify that we get an exception and not a null pointer for null input.
      */
     @Test
-    public void testGetDatesWithNullInput()
+    void testGetDatesWithNullInput()
     {
         try
         {
@@ -88,11 +88,12 @@ public void testGetDatesWithNullInput()
             // expected
         }
     }
+
     /**
      * Verify that we get an exception and not a null pointer for null input.
      */
     @Test
-    public void testGetDateWithNullInput()
+    void testGetDateWithNullInput()
     {
         try
         {
@@ -111,25 +112,26 @@ public void testGetDateWithNullInput()
      * @throws ParseException
      */
     @Test
-    public void testGetsDatesMultiple()
+    void testGetsDatesMultiple()
         throws ParseException
     {
         final String schedule = "12:34:56,03:51:00,12:34:12";
         final Date[] dates = ScheduleParser.createDatesForSchedule( schedule );
         //System.out.println( dates );
-        assertEquals( "Wrong number of dates returned.", 3, dates.length );
+        assertEquals( 3, dates.length, "Wrong number of dates returned." );
     }
+
     /**
      * Verify that we get one date for one date.
      * @throws ParseException
      */
     @Test
-    public void testGetsDatesSingle()
+    void testGetsDatesSingle()
         throws ParseException
     {
         final String schedule = "12:34:56";
         final Date[] dates = ScheduleParser.createDatesForSchedule( schedule );
 
-        assertEquals( "Wrong number of dates returned.", 1, dates.length );
+        assertEquals( 1, dates.length, "Wrong number of dates returned." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWaitFacadeUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWaitFacadeUnitTest.java
index b61da1748..96a24d222 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWaitFacadeUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWaitFacadeUnitTest.java
@@ -19,28 +19,29 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.jcs3.auxiliary.lateral.socket.tcp.TCPLateralCacheAttributes;
 import org.apache.commons.jcs3.engine.ZombieCacheServiceNonLocal;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for LateralCacheNoWaitFacade.
  */
-public class LateralCacheNoWaitFacadeUnitTest
+class LateralCacheNoWaitFacadeUnitTest
 {
     private LateralCacheNoWaitFacade<String, String> facade;
     private LateralCache<String, String> cache;
 
-    @Before
-    public void setUp() throws Exception
+    @BeforeEach
+    void setUp()
+        throws Exception
     {
         // SETUP
         final List<LateralCacheNoWait<String, String>> noWaits = new ArrayList<>();
@@ -56,7 +57,7 @@ public void setUp() throws Exception
      * Verify that we can remove an item.
      */
     @Test
-    public void testAdd_InList()
+    void testAdd_InList()
     {
         final LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<>( cache );
 
@@ -65,15 +66,15 @@ public void testAdd_InList()
         facade.addNoWait( noWait );
 
         // VERIFY
-        assertTrue( "Should be in the list.", facade.containsNoWait( noWait ) );
-        assertEquals( "Should only have 1", 1, facade.getNoWaitSize() );
+        assertTrue( facade.containsNoWait( noWait ), "Should be in the list." );
+        assertEquals( 1, facade.getNoWaitSize(), "Should only have 1" );
     }
 
     /**
      * Verify that we can remove an item.
      */
     @Test
-    public void testAddThenRemoveNoWait_InList()
+    void testAddThenRemoveNoWait_InList()
     {
         final LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<>( cache );
 
@@ -81,21 +82,21 @@ public void testAddThenRemoveNoWait_InList()
         facade.addNoWait( noWait );
 
         // VERIFY
-        assertTrue( "Should be in the list.", facade.containsNoWait( noWait ) );
+        assertTrue( facade.containsNoWait( noWait ), "Should be in the list." );
 
         // DO WORK
         facade.removeNoWait( noWait );
 
         // VERIFY
-        assertEquals( "Should have 0", 0, facade.getNoWaitSize() );
-        assertFalse( "Should not be in the list. ", facade.containsNoWait( noWait ) );
+        assertEquals( 0, facade.getNoWaitSize(), "Should have 0" );
+        assertFalse( facade.containsNoWait( noWait ), "Should not be in the list. " );
     }
 
     /**
      * Verify that we can remove an item.
      */
     @Test
-    public void testAddThenRemoveNoWait_InListSize2()
+    void testAddThenRemoveNoWait_InListSize2()
     {
         final LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<>( cache );
         noWait.setIdentityKey("1234");
@@ -107,24 +108,24 @@ public void testAddThenRemoveNoWait_InListSize2()
         facade.addNoWait( noWait2 );
 
         // VERIFY
-        assertEquals( "Should have 2", 2, facade.getNoWaitSize() );
-        assertTrue( "Should be in the list.", facade.containsNoWait( noWait ) );
-        assertTrue( "Should be in the list.", facade.containsNoWait( noWait2 ) );
+        assertEquals( 2, facade.getNoWaitSize(), "Should have 2" );
+        assertTrue( facade.containsNoWait( noWait ), "Should be in the list." );
+        assertTrue( facade.containsNoWait( noWait2 ), "Should be in the list." );
 
         // DO WORK
         facade.removeNoWait( noWait );
 
         // VERIFY
-        assertEquals( "Should only have 1", 1, facade.getNoWaitSize() );
-        assertFalse( "Should not be in the list. ", facade.containsNoWait( noWait ) );
-        assertTrue( "Should be in the list.", facade.containsNoWait( noWait2 ) );
+        assertEquals( 1, facade.getNoWaitSize(), "Should only have 1" );
+        assertFalse( facade.containsNoWait( noWait ), "Should not be in the list. " );
+        assertTrue( facade.containsNoWait( noWait2 ), "Should be in the list." );
     }
 
     /**
      * Verify that we can remove an item.
      */
     @Test
-    public void testAddThenRemoveNoWait_NotInList()
+    void testAddThenRemoveNoWait_NotInList()
     {
         final LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<>( cache );
 
@@ -132,6 +133,6 @@ public void testAddThenRemoveNoWait_NotInList()
         facade.removeNoWait( noWait );
 
         // VERIFY
-        assertFalse( "Should not be in the list.", facade.containsNoWait( noWait ) );
+        assertFalse( facade.containsNoWait( noWait ), "Should not be in the list." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java
index 0c5e34487..24a6a7f39 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java
@@ -19,8 +19,8 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Random;
 
@@ -149,7 +149,7 @@ else if ( n == 2 )
         final String data = "testData" + testNum;
         jcs.put( key, data );
         final String value = jcs.get( key );
-        assertEquals( "Couldn't put normally.", data, value );
+        assertEquals( data, value, "Couldn't put normally." );
 
         // make sure the items we can find are in the correct region.
         for ( int i = 1; i < numOps; i++ )
@@ -158,7 +158,7 @@ else if ( n == 2 )
             final String dataL = jcs.get( keyL );
             if ( dataL != null )
             {
-                assertTrue( "Incorrect region detected.", dataL.startsWith( region ) );
+                assertTrue( dataL.startsWith( region ), "Incorrect region detected." );
             }
 
         }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListenerUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListenerUnitTest.java
index a677d21a3..b65d3f6a8 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListenerUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListenerUnitTest.java
@@ -19,8 +19,8 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,11 +35,11 @@
 import org.apache.commons.jcs3.engine.logging.MockCacheEventLogger;
 import org.apache.commons.jcs3.utils.discovery.DiscoveredService;
 import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /** Test for the listener that observers UDP discovery events. */
-public class LateralTCPDiscoveryListenerUnitTest
+class LateralTCPDiscoveryListenerUnitTest
 {
     /** The listener */
     private LateralTCPDiscoveryListener listener;
@@ -57,8 +57,9 @@ public class LateralTCPDiscoveryListenerUnitTest
     protected IElementSerializer elementSerializer;
 
     /** Create the listener for testing */
-    @Before
-    public void setUp() throws Exception
+    @BeforeEach
+    void setUp()
+        throws Exception
     {
         factory = new LateralTCPCacheFactory();
         factory.initialize();
@@ -93,7 +94,7 @@ private LateralCacheNoWait<String, String> setupNoWait(final String cacheName)
      * Add a no wait to a known facade.
      */
     @Test
-    public void testAddDiscoveredService_FacadeInList_NoWaitNot()
+    void testAddDiscoveredService_FacadeInList_NoWaitNot()
     {
         // SETUP
         final String cacheName = "testAddDiscoveredService_FacadeInList_NoWaitNot";
@@ -121,14 +122,14 @@ public void testAddDiscoveredService_FacadeInList_NoWaitNot()
         listener.addDiscoveredService( service );
 
         // VERIFY
-        assertTrue( "Should have no wait.", listener.containsNoWait( cacheName, noWait ) );
+        assertTrue( listener.containsNoWait( cacheName, noWait ), "Should have no wait." );
     }
 
     /**
      * Add a no wait to a known facade.
      */
     @Test
-    public void testAddNoWait_FacadeInList()
+    void testAddNoWait_FacadeInList()
     {
         // SETUP
         final String cacheName = "testAddNoWaitFacade_FacadeInList";
@@ -141,14 +142,14 @@ public void testAddNoWait_FacadeInList()
         final boolean result = listener.addNoWait( noWait );
 
         // VERIFY
-        assertTrue( "Should have added the no wait.", result );
+        assertTrue( result, "Should have added the no wait." );
     }
 
     /**
      * Add a no wait from an unknown facade.
      */
     @Test
-    public void testAddNoWait_FacadeNotInList()
+    void testAddNoWait_FacadeNotInList()
     {
         // SETUP
         final String cacheName = "testAddNoWaitFacade_FacadeInList";
@@ -158,14 +159,14 @@ public void testAddNoWait_FacadeNotInList()
         final boolean result = listener.addNoWait( noWait );
 
         // VERIFY
-        assertFalse( "Should not have added the no wait.", result );
+        assertFalse( result, "Should not have added the no wait." );
     }
 
     /**
      * Add a no wait facade.
      */
     @Test
-    public void testAddNoWaitFacade_NotInList()
+    void testAddNoWaitFacade_NotInList()
     {
         // SETUP
         final String cacheName = "testAddNoWaitFacade_NotInList";
@@ -175,14 +176,14 @@ public void testAddNoWaitFacade_NotInList()
         listener.addNoWaitFacade( cacheName, facade );
 
         // VERIFY
-        assertTrue( "Should have the facade.", listener.containsNoWaitFacade( cacheName ) );
+        assertTrue( listener.containsNoWaitFacade( cacheName ), "Should have the facade." );
     }
 
     /**
      * Test cache creation with empty noWaits.
      */
     @Test
-    public void testEmptyNoWaits()
+    void testEmptyNoWaits()
     {
         // SETUP
         final String cacheName = "testEmptyNoWaits";
@@ -195,14 +196,14 @@ public void testEmptyNoWaits()
         final LateralCacheNoWaitFacade<String, String> noWait = factory.createCache(lca, cacheMgr, cacheEventLogger, elementSerializer);
 
         // VERIFY
-        assertFalse( "No waits should be empty.", noWait.containsNoWait(""));
+        assertFalse( noWait.containsNoWait( "" ), "No waits should be empty." );
     }
 
     /**
      * Remove a no wait from a known facade.
      */
     @Test
-    public void testRemoveDiscoveredService_FacadeInList_NoWaitIs()
+    void testRemoveDiscoveredService_FacadeInList_NoWaitIs()
     {
         // SETUP
         final String cacheName = "testRemoveDiscoveredService_FacadeInList_NoWaitIs";
@@ -232,14 +233,14 @@ public void testRemoveDiscoveredService_FacadeInList_NoWaitIs()
         listener.removeDiscoveredService( service );
 
         // VERIFY
-        assertFalse( "Should not have no wait.", listener.containsNoWait( cacheName, noWait ) );
+        assertFalse( listener.containsNoWait( cacheName, noWait ), "Should not have no wait." );
     }
 
     /**
      * Remove a no wait from a known facade.
      */
     @Test
-    public void testRemoveNoWait_FacadeInList_NoWaitIs()
+    void testRemoveNoWait_FacadeInList_NoWaitIs()
     {
         // SETUP
         final String cacheName = "testRemoveNoWaitFacade_FacadeInListNoWaitIs";
@@ -253,14 +254,14 @@ public void testRemoveNoWait_FacadeInList_NoWaitIs()
         final boolean result = listener.removeNoWait( noWait );
 
         // VERIFY
-        assertTrue( "Should have removed the no wait.", result );
+        assertTrue( result, "Should have removed the no wait." );
     }
 
     /**
      * Remove a no wait from a known facade.
      */
     @Test
-    public void testRemoveNoWait_FacadeInList_NoWaitNot()
+    void testRemoveNoWait_FacadeInList_NoWaitNot()
     {
         // SETUP
         final String cacheName = "testAddNoWaitFacade_FacadeInList";
@@ -273,14 +274,14 @@ public void testRemoveNoWait_FacadeInList_NoWaitNot()
         final boolean result = listener.removeNoWait( noWait );
 
         // VERIFY
-        assertFalse( "Should not have removed the no wait.", result );
+        assertFalse( result, "Should not have removed the no wait." );
     }
 
     /**
      * Remove a no wait from an unknown facade.
      */
     @Test
-    public void testRemoveNoWait_FacadeNotInList()
+    void testRemoveNoWait_FacadeNotInList()
     {
         // SETUP
         final String cacheName = "testRemoveNoWaitFacade_FacadeNotInList";
@@ -290,6 +291,6 @@ public void testRemoveNoWait_FacadeNotInList()
         final boolean result = listener.removeNoWait( noWait );
 
         // VERIFY
-        assertFalse( "Should not have removed the no wait.", result );
+        assertFalse( result, "Should not have removed the no wait." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java
index bff47a29c..401de5a07 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.Serializable;
 
@@ -32,8 +32,8 @@
 import org.apache.commons.jcs3.engine.CacheElement;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
 import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -137,7 +137,7 @@ public int hashCode()
         final String data = "testData" + testNum;
         jcs.put( key, data );
         final String value = jcs.get( key );
-        assertEquals( "Couldn't put normally.", data, value );
+        assertEquals( data, value, "Couldn't put normally." );
 
         // make sure the items we can find are in the correct region.
         for ( int i = 1; i < numOps; i++ )
@@ -146,7 +146,7 @@ public int hashCode()
             final String dataL = jcs.get( keyL );
             if ( dataL != null )
             {
-                assertTrue( "Incorrect region detected.", dataL.startsWith( region ) );
+                assertTrue( dataL.startsWith( region ), "Incorrect region detected." );
             }
 
         }
@@ -155,7 +155,7 @@ public int hashCode()
 
         final Object testObj1 = cache.get( keyToBeRemovedOnPut );
         p( "test object1 = " + testObj1 );
-        assertNull( "The test object should have been remvoed by a put.", testObj1 );
+        assertNull( testObj1, "The test object should have been remvoed by a put." );
 
         final Object testObj2 = cache.get( keyToNotBeRemovedOnPut );
         p( "test object2 = " + testObj2 + " hashCode = " );
@@ -163,15 +163,15 @@ public int hashCode()
         {
             p( "test2 hashCode = " + +testObj2.hashCode() );
         }
-        assertNotNull( "This should not have been removed, since the hascode were the same.", testObj2 );
+        assertNotNull( testObj2, "This should not have been removed, since the hascode were the same." );
 
     }
 
     /**
      * Test setup
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
     {
         System.setProperty( "jcs.auxiliary.LTCP.attributes.TcpServers", "localhost:" + serverPort );
         JCS.setConfigFilename( "/TestTCPLateralRemoveFilter.ccf" );
@@ -182,7 +182,7 @@ public void setUp()
      * @throws Exception
      */
     @Test
-    public void test()
+    void test()
         throws Exception
     {
         runTestForRegion( "region1", 200, 1 );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPIssueRemoveOnPutUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPIssueRemoveOnPutUnitTest.java
index 2b3ae603d..de42fe0dc 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPIssueRemoveOnPutUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPIssueRemoveOnPutUnitTest.java
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Random;
 
@@ -32,8 +32,8 @@
 import org.apache.commons.jcs3.engine.CacheElement;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
 import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the issue remove on put fuctionality.
@@ -129,7 +129,7 @@ public static void runTestForRegion( final String region, final int range, final
         final String data = "testData" + testNum;
         jcs.put( key, data );
         final String value = jcs.get( key );
-        assertEquals( "Couldn't put normally.", data, value );
+        assertEquals( data, value, "Couldn't put normally." );
 
         // make sure the items we can find are in the correct region.
         for ( int i = 1; i < numOps; i++ )
@@ -138,7 +138,7 @@ public static void runTestForRegion( final String region, final int range, final
             final String dataL = jcs.get( keyL );
             if ( dataL != null )
             {
-                assertTrue( "Incorrect region detected.", dataL.startsWith( region ) );
+                assertTrue( dataL.startsWith( region ), "Incorrect region detected." );
             }
 
         }
@@ -147,15 +147,15 @@ public static void runTestForRegion( final String region, final int range, final
 
         final Object testObj = cache.get( keyToBeRemovedOnPut );
         p( "runTestForRegion, test object = " + testObj );
-        assertNull( "The test object should have been removed by a put.", testObj );
+        assertNull( testObj, "The test object should have been removed by a put." );
 
     }
 
     /**
      * Test setup
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
     {
         System.setProperty( "jcs.auxiliary.LTCP.attributes.TcpServers", "localhost:" + serverPort );
         JCS.setConfigFilename( "/TestTCPLateralIssueRemoveCache.ccf" );
@@ -165,7 +165,7 @@ public void setUp()
      * @throws Exception
      */
     @Test
-    public void testPutLocalPutRemoteGetBusyVerifyRemoved()
+    void testPutLocalPutRemoteGetBusyVerifyRemoved()
         throws Exception
     {
         runTestForRegion( "region1", 1, 200, 1 );
@@ -178,7 +178,7 @@ public void testPutLocalPutRemoteGetBusyVerifyRemoved()
      * @throws Exception
      */
     @Test
-    public void testStandardPut()
+    void testStandardPut()
         throws Exception
     {
         final String region = "region1";
@@ -212,6 +212,6 @@ public void testStandardPut()
 
         final Object testObj = cache.get( keyToBeRemovedOnPut );
         p( "testStandardPut, test object = " + testObj );
-        assertNotNull( "The test object should not have been removed by a put.", testObj );
+        assertNotNull( testObj, "The test object should not have been removed by a put." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPNoDeadLockConcurrentTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPNoDeadLockConcurrentTest.java
index 1a6518006..afa6e9a4d 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPNoDeadLockConcurrentTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPNoDeadLockConcurrentTest.java
@@ -19,13 +19,10 @@
  * under the License.
  */
 
-import junit.extensions.ActiveTestSuite;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
 import org.apache.commons.jcs3.JCS;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test which exercises the tcp lateral cache. Runs two threads against the
@@ -33,85 +30,58 @@
  */
 public class LateralTCPNoDeadLockConcurrentTest
 {
+
     /**
-     * A unit test suite for JUnit
-     *
-     * @return The test suite
+     * Setup method for JUnit 5, executed before each test.
      */
-    public static Test suite()
+    @BeforeEach
+    void setUp()
     {
         System.setProperty( "jcs.auxiliary.LTCP.attributes.PutOnlyMode", "false" );
+        JCS.setConfigFilename( "/TestTCPLateralCacheConcurrent.ccf" );
+    }
 
-        final ActiveTestSuite suite = new ActiveTestSuite();
-
-        suite.addTest(new TestCase("testLateralTCPCache1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                LateralTCPConcurrentRandomTestUtil.runTestForRegion( "region1", 1, 200, 1 );
-            }
-        });
-
-        suite.addTest(new TestCase("testLateralTCPCache2" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                LateralTCPConcurrentRandomTestUtil.runTestForRegion( "region2", 10000, 12000, 2 );
-            }
-        });
-
-        suite.addTest(new TestCase("testLateralTCPCache3" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                LateralTCPConcurrentRandomTestUtil.runTestForRegion( "region3", 10000, 12000, 3 );
-            }
-        });
+    /**
+     * Test tearDown. Dispose of the cache after each test.
+     */
+    @AfterEach
+    void tearDown()
+    {
+        JCS.shutdown();
+    }
 
-        suite.addTest(new TestCase("testLateralTCPCache4" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                LateralTCPConcurrentRandomTestUtil.runTestForRegion( "region3", 10000, 13000, 4 );
-            }
-        });
+    @Test
+    void testLateralTCPCache1()
+        throws Exception
+    {
+        LateralTCPConcurrentRandomTestUtil.runTestForRegion( "region1", 1, 200, 1 );
+    }
 
-        suite.addTest(new TestCase("testLateralTCPCache5" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                LateralTCPConcurrentRandomTestUtil.runTestForRegion( "region4", 10000, 11000, 5 );
-            }
-        });
+    @Test
+    void testLateralTCPCache2()
+        throws Exception
+    {
+        LateralTCPConcurrentRandomTestUtil.runTestForRegion( "region2", 10000, 12000, 2 );
+    }
 
-        return suite;
+    @Test
+    void testLateralTCPCache3()
+        throws Exception
+    {
+        LateralTCPConcurrentRandomTestUtil.runTestForRegion( "region3", 10000, 12000, 3 );
     }
 
-    /**
-     * Test setup
-     */
-    @Before
-    public void setUp()
+    @Test
+    void testLateralTCPCache4()
+        throws Exception
     {
-        JCS.setConfigFilename( "/TestTCPLateralCacheConcurrent.ccf" );
+        LateralTCPConcurrentRandomTestUtil.runTestForRegion( "region3", 10000, 13000, 4 );
     }
 
-    /**
-     * Test tearDown. Dispose of the cache.
-     */
-    @After
-    public void tearDown()
+    @Test
+    void testLateralTCPCache5()
+        throws Exception
     {
-        JCS.shutdown();
+        LateralTCPConcurrentRandomTestUtil.runTestForRegion( "region4", 10000, 11000, 5 );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/TestTCPLateralUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/TestTCPLateralUnitTest.java
index e87c9ad04..6a6cd7860 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/TestTCPLateralUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/TestTCPLateralUnitTest.java
@@ -1,8 +1,5 @@
 package org.apache.commons.jcs3.auxiliary.lateral.socket.tcp;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,6 +19,9 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import java.io.IOException;
 import java.util.Map;
 import java.util.Set;
@@ -42,13 +42,13 @@
 import org.apache.commons.jcs3.utils.serialization.EncryptingSerializer;
 import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
 import org.apache.commons.jcs3.utils.timing.SleepUtil;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Basic unit tests for the sending and receiving portions of the lateral cache.
  */
-public class TestTCPLateralUnitTest
+class TestTCPLateralUnitTest
 {
     private final MockCompositeCacheManager cacheMgr = new MockCompositeCacheManager();
 
@@ -84,8 +84,8 @@ private <K, V> LateralTCPService<K, V> createService(final int listenerPort, fin
     /**
      * Test setup
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
     {
         JCS.setConfigFilename( "/TestTCPLateralCache.ccf" );
     }
@@ -123,7 +123,7 @@ private void simpleSend(final IElementSerializer serializer, final int port ) th
         SleepUtil.sleepAtLeast( numMes * 4 ); // this may need to be adjusted ...
 
         // VERIFY
-        assertEquals( "Should have received " + numMes + " by now.", numMes, listener.getPutCnt() );
+        assertEquals( numMes, listener.getPutCnt(), "Should have received " + numMes + " by now." );
     }
 
     /**
@@ -133,7 +133,7 @@ private void simpleSend(final IElementSerializer serializer, final int port ) th
      * @throws Exception
      */
     @Test
-    public void testGet_SendAndReceived()
+    void testGet_SendAndReceived()
         throws Exception
     {
         // SETUP
@@ -152,8 +152,8 @@ public void testGet_SendAndReceived()
         final ICacheElement<String, String> result = service.get( "test", "key" );
 
         // VERIFY
-        assertNotNull( "Result should not be null.", result );
-        assertEquals( "Didn't get the correct object", element.getVal(), result.getVal() );
+        assertNotNull( result, "Result should not be null." );
+        assertEquals( element.getVal(), result.getVal(), "Didn't get the correct object" );
     }
 
     /**
@@ -163,7 +163,8 @@ public void testGet_SendAndReceived()
      * @throws Exception
      */
     @Test
-    public void testGetGroupKeys_SendAndReceived()  throws Exception
+    void testGetGroupKeys_SendAndReceived()
+        throws Exception
     {
         // SETUP
         final CompositeCache<GroupAttrName<String>, String> cache = createCache(1150);
@@ -185,8 +186,8 @@ public void testGetGroupKeys_SendAndReceived()  throws Exception
        // SleepUtil.sleepAtLeast( 5000000 );
 
         // VERIFY
-        assertNotNull( "Result should not be null.", result );
-        assertEquals( "Didn't get the correct object", "key", result.iterator().next().attrName );
+        assertNotNull( result, "Result should not be null." );
+        assertEquals( "key", result.iterator().next().attrName, "Didn't get the correct object" );
     }
 
     /**
@@ -196,7 +197,7 @@ public void testGetGroupKeys_SendAndReceived()  throws Exception
      * @throws Exception
      */
     @Test
-    public void testGetMatching_WithData()
+    void testGetMatching_WithData()
         throws Exception
     {
         // SETUP
@@ -221,15 +222,15 @@ public void testGetMatching_WithData()
         final Map<String, ICacheElement<String, Integer>> result = service.getMatching( "test", keyprefix1 + ".+" );
 
         // VERIFY
-        assertNotNull( "Result should not be null.", result );
-        assertEquals( "Wrong number returned 1:", numToInsertPrefix1, result.size() );
+        assertNotNull( result, "Result should not be null." );
+        assertEquals( numToInsertPrefix1, result.size(), "Wrong number returned 1:" );
     }
 
     /**
      * @throws Exception
      */
     @Test
-    public void testReceive()
+    void testReceive()
         throws Exception
     {
         // VERIFY
@@ -248,7 +249,7 @@ public void testReceive()
         SleepUtil.sleepAtLeast( 1000 );
 
         // VERIFY
-        assertEquals( "Didn't get the correct number", cnt, cacheMgr.getCache().getUpdateCount() );
+        assertEquals( cnt, cacheMgr.getCache().getUpdateCount(), "Didn't get the correct number" );
     }
 
     /**
@@ -257,7 +258,7 @@ public void testReceive()
      * @throws Exception
      */
     @Test
-    public void testSameKeyDifferentObject()
+    void testSameKeyDifferentObject()
         throws Exception
     {
         // SETUP
@@ -279,7 +280,7 @@ public void testSameKeyDifferentObject()
 
         // VERIFY
         final ICacheElement<String, String> cacheElement = cache.get( "key" );
-        assertEquals( "Didn't get the correct object "+ cacheElement, element2.getVal(), cacheElement.getVal() );
+        assertEquals( element2.getVal(), cacheElement.getVal(), "Didn't get the correct object " + cacheElement );
     }
 
     /**
@@ -288,7 +289,7 @@ public void testSameKeyDifferentObject()
      * @throws Exception
      */
     @Test
-    public void testSameKeyObjectDifferentValueObject()
+    void testSameKeyObjectDifferentValueObject()
         throws Exception
     {
         final CompositeCache<String, String> cache = createCache(1105);
@@ -309,15 +310,15 @@ public void testSameKeyObjectDifferentValueObject()
 
         // VERIFY
         final ICacheElement<String, String> cacheElement = cache.get( "key" );
-        assertEquals( "Didn't get the correct object: " + cacheElement , element2.getVal(), cacheElement.getVal() );
+        assertEquals( element2.getVal(), cacheElement.getVal(), "Didn't get the correct object: " + cacheElement );
     }
 
     /**
      * @throws Exception
      */
     @Test
-    public void testSimpleEncryptedSend()
-            throws Exception
+    void testSimpleEncryptedSend()
+        throws Exception
     {
     	final EncryptingSerializer serializer = new EncryptingSerializer();
     	serializer.setPreSharedKey("my_key");
@@ -332,7 +333,7 @@ public void testSimpleEncryptedSend()
      * @throws Exception
      */
     @Test
-    public void testSimpleSend()
+    void testSimpleSend()
         throws Exception
     {
     	simpleSend(new StandardSerializer(), 8111);
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheListenerUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheListenerUnitTest.java
index 4cc5baca5..358fd5f02 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheListenerUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheListenerUnitTest.java
@@ -19,9 +19,9 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.apache.commons.jcs3.auxiliary.remote.behavior.IRemoteCacheAttributes;
 import org.apache.commons.jcs3.engine.CacheElementSerialized;
@@ -34,12 +34,12 @@
 import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
 import org.apache.commons.jcs3.engine.control.MockCompositeCacheManager;
 import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the remote cache listener.
  */
-public class RemoteCacheListenerUnitTest
+class RemoteCacheListenerUnitTest
 {
     /**
      * Create a RemoteCacheListener with a mock cache manager.  Set remove on put to false.
@@ -49,7 +49,7 @@ public class RemoteCacheListenerUnitTest
      * @throws Exception
      */
     @Test
-    public void testUpdate_PutOnPut()
+    void testUpdate_PutOnPut()
         throws Exception
     {
         // SETUP
@@ -77,12 +77,12 @@ public void testUpdate_PutOnPut()
         final ICache<String, String> cache = cacheMgr.getCache( cacheName );
         final ICacheElement<String, String> after = cache.get( key );
 
-        assertNotNull( "Should have a deserialized object.", after );
-        assertEquals( "Values should be the same.", value, after.getVal() );
-        assertEquals( "Attributes should be the same.", attr.getMaxLife(), after
-            .getElementAttributes().getMaxLife() );
-        assertEquals( "Keys should be the same.", key, after.getKey() );
-        assertEquals( "Cache name should be the same.", cacheName, after.getCacheName() );
+        assertNotNull( after, "Should have a deserialized object." );
+        assertEquals( value, after.getVal(), "Values should be the same." );
+        assertEquals( attr.getMaxLife(), after
+            .getElementAttributes().getMaxLife(), "Attributes should be the same." );
+        assertEquals( key, after.getKey(), "Keys should be the same." );
+        assertEquals( cacheName, after.getCacheName(), "Cache name should be the same." );
     }
 
     /**
@@ -93,7 +93,7 @@ public void testUpdate_PutOnPut()
      * @throws Exception
      */
     @Test
-    public void testUpdate_RemoveOnPut()
+    void testUpdate_RemoveOnPut()
         throws Exception
     {
         // SETUP
@@ -121,6 +121,6 @@ public void testUpdate_RemoveOnPut()
         final ICache<String, String> cache = cacheMgr.getCache( cacheName );
         final ICacheElement<String, String> after = cache.get( key );
 
-        assertNull( "Should not have a deserialized object since remove on put is true.", after );
+        assertNull( after, "Should not have a deserialized object since remove on put is true." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWaitFacadeUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWaitFacadeUnitTest.java
index 1e9b958ab..7bc8631a9 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWaitFacadeUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWaitFacadeUnitTest.java
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,18 +30,18 @@
 import org.apache.commons.jcs3.auxiliary.AuxiliaryCache;
 import org.apache.commons.jcs3.auxiliary.remote.behavior.IRemoteCacheAttributes;
 import org.apache.commons.jcs3.engine.CacheStatus;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for RemoteCacheNoWaitFacade.
  */
-public class RemoteCacheNoWaitFacadeUnitTest
+class RemoteCacheNoWaitFacadeUnitTest
 {
     /**
      * Verify that we can add an item.
      */
     @Test
-    public void testAddNoWait_InList()
+    void testAddNoWait_InList()
     {
         // SETUP
         final List<RemoteCacheNoWait<String, String>> noWaits = new ArrayList<>();
@@ -55,16 +55,17 @@ public void testAddNoWait_InList()
         final RemoteCacheNoWaitFacade<String, String> facade = new RemoteCacheNoWaitFacade<>(noWaits, cattr, null, null, null );
 
         // VERIFY
-        assertEquals( "Should have one entry.", 1, facade.noWaits.size() );
-        assertTrue( "Should be in the list.", facade.noWaits.contains( noWait ) );
-        assertSame( "Should have same facade.", facade, ((RemoteCache<String, String>)facade.noWaits.get(0).getRemoteCache()).getFacade() );
+        assertEquals( 1, facade.noWaits.size(), "Should have one entry." );
+        assertTrue( facade.noWaits.contains( noWait ), "Should be in the list." );
+        assertSame( facade, ( (RemoteCache<String, String>) facade.noWaits.get( 0 ).getRemoteCache() ).getFacade(),
+                    "Should have same facade." );
     }
 
     /**
      * Verify that failover works
      */
     @Test
-    public void testFailover()
+    void testFailover()
     {
         // SETUP
         final IRemoteCacheAttributes cattr = new RemoteCacheAttributes();
@@ -78,23 +79,23 @@ public void testFailover()
         final AuxiliaryCache<String, String> cache = factory.createCache(cattr, null, null, null);
         final RemoteCacheNoWaitFacade<String, String> facade =
                 (RemoteCacheNoWaitFacade<String, String>) cache;
-        assertEquals("Should have two failovers.", 2, cattr.getFailovers().size());
-        assertEquals("Should have two managers.", 2, factory.managers.size());
-        assertEquals("Should have primary server.", 0, cattr.getFailoverIndex());
+        assertEquals( 2, cattr.getFailovers().size(), "Should have two failovers." );
+        assertEquals( 2, factory.managers.size(), "Should have two managers." );
+        assertEquals( 0, cattr.getFailoverIndex(), "Should have primary server." );
         final RemoteCacheNoWait<String, String> primary = facade.getPrimaryServer();
-        assertEquals("Should be ALIVE", CacheStatus.ALIVE, primary.getStatus());
+        assertEquals( CacheStatus.ALIVE, primary.getStatus(), "Should be ALIVE" );
 
         // Make primary unusable
         facade.getPrimaryServer().getCacheEventQueue().destroy();
-        assertEquals("Should be ERROR", CacheStatus.ERROR, primary.getStatus());
+        assertEquals( CacheStatus.ERROR, primary.getStatus(), "Should be ERROR" );
         facade.attemptRestorePrimary = false;
         facade.connectAndRestore();
 
         // VERIFY
-        assertEquals("Should have two failovers.", 2, cattr.getFailovers().size());
-        assertEquals("Should have two managers.", 2, factory.managers.size());
-        assertEquals("Should have switched to secondary server.", 1, cattr.getFailoverIndex());
-        assertNotSame("Should have diferent primary now", primary, facade.getPrimaryServer());
-        assertEquals("Should be ALIVE", CacheStatus.ALIVE, facade.getPrimaryServer().getStatus());
+        assertEquals( 2, cattr.getFailovers().size(), "Should have two failovers." );
+        assertEquals( 2, factory.managers.size(), "Should have two managers." );
+        assertEquals( 1, cattr.getFailoverIndex(), "Should have switched to secondary server." );
+        assertNotSame( primary, facade.getPrimaryServer(), "Should have diferent primary now" );
+        assertEquals( CacheStatus.ALIVE, facade.getPrimaryServer().getStatus(), "Should be ALIVE" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWaitUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWaitUnitTest.java
index f27550138..9b63265da 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWaitUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWaitUnitTest.java
@@ -19,8 +19,8 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -31,12 +31,12 @@
 import org.apache.commons.jcs3.engine.CacheStatus;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
 import org.apache.commons.jcs3.utils.timing.SleepUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the remote cache no wait. The no wait manages a queue on top of the client.
  */
-public class RemoteCacheNoWaitUnitTest
+class RemoteCacheNoWaitUnitTest
 {
     /**
      * Simply verify that the serviced supplied to fix is passed onto the client. Verify that the
@@ -45,7 +45,7 @@ public class RemoteCacheNoWaitUnitTest
      * @throws Exception
      */
     @Test
-    public void testFixCache()
+    void testFixCache()
         throws Exception
     {
         // SETUP
@@ -68,7 +68,7 @@ public void testFixCache()
         SleepUtil.sleepAtLeast( 10 );
 
         // VERIFY
-        assertEquals( "Wrong status", service, client.fixed );
+        assertEquals( service, client.fixed, "Wrong status" );
     }
 
     /**
@@ -77,7 +77,7 @@ public void testFixCache()
      * @throws Exception
      */
     @Test
-    public void testGet()
+    void testGet()
         throws Exception
     {
         // SETUP
@@ -91,7 +91,7 @@ public void testGet()
         final ICacheElement<String, String> result = noWait.get( "key" );
 
         // VERIFY
-        assertEquals( "Wrong element", input, result );
+        assertEquals( input, result, "Wrong element" );
     }
 
     /**
@@ -100,7 +100,7 @@ public void testGet()
      * @throws Exception
      */
     @Test
-    public void testGetMultiple()
+    void testGetMultiple()
         throws Exception
     {
         // SETUP
@@ -120,7 +120,7 @@ public void testGetMultiple()
         final Map<String, ICacheElement<String, String>> result = noWait.getMultiple( keys );
 
         // VERIFY
-        assertEquals( "elements map", inputMap, result );
+        assertEquals( inputMap, result, "elements map" );
     }
 
     /**
@@ -129,7 +129,7 @@ public void testGetMultiple()
      * @throws Exception
      */
     @Test
-    public void testGetStats()
+    void testGetStats()
         throws Exception
     {
         // SETUP
@@ -141,7 +141,7 @@ public void testGetStats()
         final String result = noWait.getStats();
 
         // VERIFY
-        assertTrue( "Status should contain 'ALIVE'", result.indexOf( "ALIVE" ) != -1 );
+        assertTrue( result.indexOf( "ALIVE" ) != -1, "Status should contain 'ALIVE'" );
     }
 
     /**
@@ -150,7 +150,7 @@ public void testGetStats()
      * @throws Exception
      */
     @Test
-    public void testGetStatus_error()
+    void testGetStatus_error()
         throws Exception
     {
         // SETUP
@@ -162,7 +162,7 @@ public void testGetStatus_error()
         final CacheStatus result = noWait.getStatus();
 
         // VERIFY
-        assertEquals( "Wrong status", CacheStatus.ERROR, result );
+        assertEquals( CacheStatus.ERROR, result, "Wrong status" );
     }
 
     /**
@@ -171,7 +171,7 @@ public void testGetStatus_error()
      * @throws Exception
      */
     @Test
-    public void testRemove()
+    void testRemove()
         throws Exception
     {
         // SETUP
@@ -186,8 +186,8 @@ public void testRemove()
         SleepUtil.sleepAtLeast( 10 );
 
         // VERIFY
-        assertEquals( "Wrong number updated.", 1, client.removeList.size() );
-        assertEquals( "Wrong key", input, client.removeList.get( 0 ) );
+        assertEquals( 1, client.removeList.size(), "Wrong number updated." );
+        assertEquals( input, client.removeList.get( 0 ), "Wrong key" );
     }
 
     /**
@@ -196,7 +196,7 @@ public void testRemove()
      * @throws Exception
      */
     @Test
-    public void testUpdate()
+    void testUpdate()
         throws Exception
     {
         // SETUP
@@ -211,7 +211,7 @@ public void testUpdate()
         // VERIFY
         SleepUtil.sleepAtLeast( 10 );
 
-        assertEquals( "Wrong number updated.", 1, client.updateList.size() );
-        assertEquals( "Wrong element", element, client.updateList.get( 0 ) );
+        assertEquals( 1, client.updateList.size(), "Wrong number updated." );
+        assertEquals( element, client.updateList.get( 0 ), "Wrong element" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheUnitTest.java
index af9dceba4..d813899e3 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheUnitTest.java
@@ -1,9 +1,5 @@
 package org.apache.commons.jcs3.auxiliary.remote;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -23,6 +19,10 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import java.util.HashSet;
 import java.util.Map;
 
@@ -33,21 +33,22 @@
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
 import org.apache.commons.jcs3.engine.behavior.ICacheElementSerialized;
 import org.apache.commons.jcs3.utils.serialization.SerializationConversionUtil;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit Tests for the Remote Cache.
  */
-public class RemoteCacheUnitTest
+class RemoteCacheUnitTest
 {
     private IRemoteCacheAttributes cattr;
     private MockRemoteCacheService<String, String> service;
     private MockRemoteCacheListener<String, String> listener;
     private RemoteCacheMonitor monitor;
 
-    @Before
-    public void setUp() throws Exception
+    @BeforeEach
+    void setUp()
+        throws Exception
     {
         cattr = new RemoteCacheAttributes();
         service = new MockRemoteCacheService<>();
@@ -61,7 +62,7 @@ public void setUp() throws Exception
      * @throws Exception
      */
     @Test
-    public void testDispose_nullListener()
+    void testDispose_nullListener()
         throws Exception
     {
         // SETUP
@@ -74,8 +75,8 @@ public void testDispose_nullListener()
         remoteCache.dispose( );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -84,7 +85,7 @@ public void testDispose_nullListener()
      * @throws Exception
      */
     @Test
-    public void testDispose_simple()
+    void testDispose_simple()
         throws Exception
     {
         final RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, service, listener, monitor );
@@ -96,8 +97,8 @@ public void testDispose_simple()
         remoteCache.dispose( );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -106,7 +107,7 @@ public void testDispose_simple()
      * @throws Exception
      */
     @Test
-    public void testGet_simple()
+    void testGet_simple()
         throws Exception
     {
         final RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, service, listener, monitor );
@@ -118,8 +119,8 @@ public void testGet_simple()
         remoteCache.get( "key" );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -128,7 +129,7 @@ public void testGet_simple()
      * @throws Exception
      */
     @Test
-    public void testGetMatching_simple()
+    void testGetMatching_simple()
         throws Exception
     {
         // SETUP
@@ -143,9 +144,9 @@ public void testGetMatching_simple()
         final Map<String, ICacheElement<String, String>> result = remoteCache.getMatching( pattern );
 
         // VERIFY
-        assertNotNull( "Should have a map", result );
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertNotNull( result, "Should have a map" );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -154,7 +155,7 @@ public void testGetMatching_simple()
      * @throws Exception
      */
     @Test
-    public void testGetMultiple_simple()
+    void testGetMultiple_simple()
         throws Exception
     {
         final RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, service, listener, monitor );
@@ -166,8 +167,8 @@ public void testGetMultiple_simple()
         remoteCache.getMultiple( new HashSet<>() );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -176,7 +177,7 @@ public void testGetMultiple_simple()
      * @throws Exception
      */
     @Test
-    public void testRemove_simple()
+    void testRemove_simple()
         throws Exception
     {
         final RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, service, listener, monitor );
@@ -188,8 +189,8 @@ public void testRemove_simple()
         remoteCache.remove( "key" );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -198,7 +199,7 @@ public void testRemove_simple()
      * @throws Exception
      */
     @Test
-    public void testRemoveAll_simple()
+    void testRemoveAll_simple()
         throws Exception
     {
         final RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, service, listener, monitor );
@@ -210,8 +211,8 @@ public void testRemoveAll_simple()
         remoteCache.remove( "key" );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -221,7 +222,7 @@ public void testRemoveAll_simple()
      * @throws Exception
      */
     @Test
-    public void testUpdate()
+    void testUpdate()
         throws Exception
     {
         // SETUP
@@ -237,13 +238,13 @@ public void testUpdate()
         remoteCache.update( element );
 
         // VERIFY
-        assertTrue( "The element should be in the serialized wrapper.",
-                    service.lastUpdate instanceof ICacheElementSerialized );
+        assertInstanceOf( ICacheElementSerialized.class, service.lastUpdate,
+                          "The element should be in the serialized wrapper." );
         final ICacheElement<String, String> result = SerializationConversionUtil
             .getDeSerializedCacheElement( (ICacheElementSerialized<String, String>) service.lastUpdate, remoteCache
                 .getElementSerializer() );
-        assertEquals( "Wrong element updated.", element.getVal(), result.getVal() );
-        assertEquals( "Wrong listener id.", Long.valueOf( listenerId ), service.updateRequestIdList.get( 0 ) );
+        assertEquals( element.getVal(), result.getVal(), "Wrong element updated." );
+        assertEquals( Long.valueOf( listenerId ), service.updateRequestIdList.get( 0 ), "Wrong listener id." );
     }
 
     /**
@@ -252,7 +253,7 @@ public void testUpdate()
      * @throws Exception
      */
     @Test
-    public void testUpdate_simple()
+    void testUpdate_simple()
         throws Exception
     {
         final RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, service, listener, monitor );
@@ -266,8 +267,8 @@ public void testUpdate_simple()
         remoteCache.update( item );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -276,7 +277,7 @@ public void testUpdate_simple()
      * @throws Exception
      */
     @Test
-    public void testUpdateZombieThenFix()
+    void testUpdateZombieThenFix()
         throws Exception
     {
         // SETUP
@@ -294,11 +295,11 @@ public void testUpdateZombieThenFix()
         remoteCache.fixCache( service );
 
         // VERIFY
-        assertTrue( "The element should be in the serialized warapper.",
-                    service.lastUpdate instanceof ICacheElementSerialized );
+        assertInstanceOf( ICacheElementSerialized.class, service.lastUpdate,
+                          "The element should be in the serialized warapper." );
         final ICacheElement<String, String> result = SerializationConversionUtil
             .getDeSerializedCacheElement( (ICacheElementSerialized<String, String>) service.lastUpdate, remoteCache
                 .getElementSerializer() );
-        assertEquals( "Wrong element updated.", element.getVal(), result.getVal() );
+        assertEquals( element.getVal(), result.getVal(), "Wrong element updated." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteUtilsUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteUtilsUnitTest.java
index 86bc0c185..f22bd0c9c 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteUtilsUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteUtilsUnitTest.java
@@ -1,9 +1,5 @@
 package org.apache.commons.jcs3.auxiliary.remote;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -23,14 +19,18 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 import java.rmi.registry.Registry;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Simple tests for remote utils. It is difficult to verify most of the things is does.
  */
-public class RemoteUtilsUnitTest
+class RemoteUtilsUnitTest
 {
     /**
      * Call create registry.
@@ -39,14 +39,14 @@ public class RemoteUtilsUnitTest
      * </p>
      */
     @Test
-    public void testCreateRegistry()
+    void testCreateRegistry()
     {
         final Registry registry = RemoteUtils.createRegistry( 1102 );
-        assertNotNull("Registry should not be null", registry);
+        assertNotNull( registry, "Registry should not be null" );
     }
 
     @Test
-    public void testGetNamingURL()
+    void testGetNamingURL()
     {
         assertEquals("//host:1/servicename", RemoteUtils.getNamingURL("host",1,"servicename"));
         assertEquals("//127.0.0.1:2/servicename", RemoteUtils.getNamingURL("127.0.0.1",2,"servicename"));
@@ -54,7 +54,7 @@ public void testGetNamingURL()
     }
 
     @Test
-    public void testParseServerAndPort()
+    void testParseServerAndPort()
     {
         RemoteLocation loc = RemoteLocation.parseServerAndPort("server1:1234");
         assertEquals("server1", loc.getHost());
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/TestRemoteCache.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/TestRemoteCache.java
index 19ef702c0..8d1626a41 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/TestRemoteCache.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/TestRemoteCache.java
@@ -32,9 +32,9 @@
 import org.apache.commons.jcs3.engine.control.MockElementSerializer;
 import org.apache.commons.jcs3.log.Log;
 import org.apache.commons.jcs3.log.LogManager;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -65,8 +65,8 @@ public TestRemoteCache()
     /**
      * Test setup
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
     {
         JCS.setConfigFilename( "/TestRemoteClient.ccf" );
     }
@@ -75,7 +75,7 @@ public void setUp()
      * @throws Exception
      */
     @Test
-    public void testService()
+    void testService()
         throws Exception
     {
 
@@ -119,8 +119,8 @@ public void testService()
      * @throws Exception
      */
     @Test
-    @Ignore
-    public void testSimpleSend()
+    @Disabled
+    void testSimpleSend()
         throws Exception
     {
         log.info( "testSimpleSend" );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/ZombieRemoteCacheServiceUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/ZombieRemoteCacheServiceUnitTest.java
index 9628d6722..947391dd7 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/ZombieRemoteCacheServiceUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/ZombieRemoteCacheServiceUnitTest.java
@@ -19,18 +19,18 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.apache.commons.jcs3.engine.CacheElement;
 import org.apache.commons.jcs3.engine.ZombieCacheServiceNonLocal;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the zombie remote cache service.
  */
-public class ZombieRemoteCacheServiceUnitTest
+class ZombieRemoteCacheServiceUnitTest
 {
     /**
      * Verify that a removeAll event gets added and then is sent to the service passed to propagate.
@@ -38,7 +38,7 @@ public class ZombieRemoteCacheServiceUnitTest
      * @throws Exception
      */
     @Test
-    public void testRemoveAllThenWalk()
+    void testRemoveAllThenWalk()
         throws Exception
     {
         // SETUP
@@ -53,7 +53,7 @@ public void testRemoveAllThenWalk()
         zombie.propagateEvents( service );
 
         // VERIFY
-        assertEquals( "Updated element is not as expected.", cacheName, service.lastRemoveAllCacheName);
+        assertEquals( cacheName, service.lastRemoveAllCacheName, "Updated element is not as expected." );
     }
 
     /**
@@ -62,7 +62,7 @@ public void testRemoveAllThenWalk()
      * @throws Exception
      */
     @Test
-    public void testRemoveThenWalk()
+    void testRemoveThenWalk()
         throws Exception
     {
         // SETUP
@@ -78,7 +78,7 @@ public void testRemoveThenWalk()
         zombie.propagateEvents( service );
 
         // VERIFY
-        assertEquals( "Updated element is not as expected.", key, service.lastRemoveKey );
+        assertEquals( key, service.lastRemoveKey, "Updated element is not as expected." );
     }
 
     /**
@@ -87,7 +87,7 @@ public void testRemoveThenWalk()
      * @throws Exception
      */
     @Test
-    public void testUpdateThenWalk()
+    void testUpdateThenWalk()
         throws Exception
     {
         // SETUP
@@ -103,7 +103,7 @@ public void testUpdateThenWalk()
         zombie.propagateEvents( service );
 
         // VERIFY
-        assertEquals( "Updated element is not as expected.", element, service.lastUpdate );
+        assertEquals( element, service.lastUpdate, "Updated element is not as expected." );
     }
 
     /**
@@ -112,7 +112,7 @@ public void testUpdateThenWalk()
      * @throws Exception
      */
     @Test
-    public void testUpdateThenWalk_zeroSize()
+    void testUpdateThenWalk_zeroSize()
         throws Exception
     {
         // SETUP
@@ -128,6 +128,6 @@ public void testUpdateThenWalk_zeroSize()
         zombie.propagateEvents( service );
 
         // VERIFY
-        assertNull( "Nothing should have been put to the service.", service.lastUpdate );
+        assertNull( service.lastUpdate, "Nothing should have been put to the service." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheClientUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheClientUnitTest.java
index 743d54d07..f0e87b5d4 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheClientUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheClientUnitTest.java
@@ -19,8 +19,8 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -32,10 +32,10 @@
 import org.apache.commons.jcs3.auxiliary.remote.value.RemoteRequestType;
 import org.apache.commons.jcs3.engine.CacheElement;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the client. */
-public class RemoteHttpCacheClientUnitTest
+class RemoteHttpCacheClientUnitTest
 {
     /**
      * Verify dispose functionality
@@ -43,7 +43,7 @@ public class RemoteHttpCacheClientUnitTest
      * @throws IOException
      */
     @Test
-    public void testDispose_normal()
+    void testDispose_normal()
         throws IOException
     {
         // SETUP
@@ -59,8 +59,8 @@ public void testDispose_normal()
         client.dispose( cacheName );
 
         // VERIFY
-        assertEquals( "Wrong type.", RemoteRequestType.DISPOSE, mockDispatcher.lastRemoteCacheRequest
-            .getRequestType() );
+        assertEquals( RemoteRequestType.DISPOSE, mockDispatcher.lastRemoteCacheRequest
+            .getRequestType(), "Wrong type." );
     }
 
     /**
@@ -69,7 +69,7 @@ public void testDispose_normal()
      * @throws IOException
      */
     @Test
-    public void testGet_normal()
+    void testGet_normal()
         throws IOException
     {
         // SETUP
@@ -93,9 +93,9 @@ public void testGet_normal()
         final ICacheElement<String, String> result = client.get( cacheName, key );
 
         // VERIFY
-        assertEquals( "Wrong result.", expected, result );
-        assertEquals( "Wrong type.", RemoteRequestType.GET, mockDispatcher.lastRemoteCacheRequest
-            .getRequestType() );
+        assertEquals( expected, result, "Wrong result." );
+        assertEquals( RemoteRequestType.GET, mockDispatcher.lastRemoteCacheRequest
+            .getRequestType(), "Wrong type." );
     }
 
     /**
@@ -104,7 +104,7 @@ public void testGet_normal()
      * @throws IOException
      */
     @Test
-    public void testGet_nullFromDispatcher()
+    void testGet_nullFromDispatcher()
         throws IOException
     {
         // SETUP
@@ -123,9 +123,9 @@ public void testGet_nullFromDispatcher()
         final ICacheElement<String, String> result = client.get( cacheName, key );
 
         // VERIFY
-        assertNull( "Wrong result.", result );
-        assertEquals( "Wrong type.", RemoteRequestType.GET, mockDispatcher.lastRemoteCacheRequest
-            .getRequestType() );
+        assertNull( result, "Wrong result." );
+        assertEquals( RemoteRequestType.GET, mockDispatcher.lastRemoteCacheRequest
+            .getRequestType(), "Wrong type." );
     }
 
     /**
@@ -134,7 +134,7 @@ public void testGet_nullFromDispatcher()
      * @throws IOException
      */
     @Test
-    public void testGetMatching_normal()
+    void testGetMatching_normal()
         throws IOException
     {
         // SETUP
@@ -160,9 +160,10 @@ public void testGetMatching_normal()
         final Map<String, ICacheElement<String, String>> result = client.getMatching( cacheName, pattern );
 
         // VERIFY
-        assertEquals( "Wrong result.", expected, result.get( "key" ) );
-        assertEquals( "Wrong type.", RemoteRequestType.GET_MATCHING,
-                      mockDispatcher.lastRemoteCacheRequest.getRequestType() );
+        assertEquals( expected, result.get( "key" ), "Wrong result." );
+        assertEquals( RemoteRequestType.GET_MATCHING,
+                      mockDispatcher.lastRemoteCacheRequest.getRequestType(),
+                      "Wrong type." );
     }
 
     /**
@@ -171,7 +172,7 @@ public void testGetMatching_normal()
      * @throws IOException
      */
     @Test
-    public void testGetMultiple_normal()
+    void testGetMultiple_normal()
         throws IOException
     {
         // SETUP
@@ -197,9 +198,10 @@ public void testGetMultiple_normal()
         final Map<String, ICacheElement<String, String>> result = client.getMultiple( cacheName, keys );
 
         // VERIFY
-        assertEquals( "Wrong result.", expected, result.get( "key" ) );
-        assertEquals( "Wrong type.", RemoteRequestType.GET_MULTIPLE,
-                      mockDispatcher.lastRemoteCacheRequest.getRequestType() );
+        assertEquals( expected, result.get( "key" ), "Wrong result." );
+        assertEquals( RemoteRequestType.GET_MULTIPLE,
+                      mockDispatcher.lastRemoteCacheRequest.getRequestType(),
+                      "Wrong type." );
     }
 
     /**
@@ -208,7 +210,7 @@ public void testGetMultiple_normal()
      * @throws IOException
      */
     @Test
-    public void testRemove_normal()
+    void testRemove_normal()
         throws IOException
     {
         // SETUP
@@ -225,8 +227,8 @@ public void testRemove_normal()
         client.remove( cacheName, key );
 
         // VERIFY
-        assertEquals( "Wrong type.", RemoteRequestType.REMOVE, mockDispatcher.lastRemoteCacheRequest
-            .getRequestType() );
+        assertEquals( RemoteRequestType.REMOVE, mockDispatcher.lastRemoteCacheRequest
+            .getRequestType(), "Wrong type." );
     }
 
     /**
@@ -235,7 +237,7 @@ public void testRemove_normal()
      * @throws IOException
      */
     @Test
-    public void testRemoveAll_normal()
+    void testRemoveAll_normal()
         throws IOException
     {
         // SETUP
@@ -251,8 +253,8 @@ public void testRemoveAll_normal()
         client.removeAll( cacheName );
 
         // VERIFY
-        assertEquals( "Wrong type.", RemoteRequestType.REMOVE_ALL, mockDispatcher.lastRemoteCacheRequest
-            .getRequestType() );
+        assertEquals( RemoteRequestType.REMOVE_ALL, mockDispatcher.lastRemoteCacheRequest
+            .getRequestType(), "Wrong type." );
     }
 
     /**
@@ -261,7 +263,7 @@ public void testRemoveAll_normal()
      * @throws IOException
      */
     @Test
-    public void testUpdate_normal()
+    void testUpdate_normal()
         throws IOException
     {
         // SETUP
@@ -279,7 +281,7 @@ public void testUpdate_normal()
         client.update( element );
 
         // VERIFY
-        assertEquals( "Wrong type.", RemoteRequestType.UPDATE, mockDispatcher.lastRemoteCacheRequest
-            .getRequestType() );
+        assertEquals( RemoteRequestType.UPDATE, mockDispatcher.lastRemoteCacheRequest
+            .getRequestType(), "Wrong type." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheFactoryUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheFactoryUnitTest.java
index 0ff03ad5a..567681241 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheFactoryUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheFactoryUnitTest.java
@@ -19,8 +19,9 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.commons.jcs3.auxiliary.AuxiliaryCache;
 import org.apache.commons.jcs3.auxiliary.remote.http.client.behavior.IRemoteHttpCacheClient;
@@ -28,14 +29,15 @@
 import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
 import org.apache.commons.jcs3.engine.control.MockCompositeCacheManager;
 import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the manager. */
-public class RemoteHttpCacheFactoryUnitTest
+class RemoteHttpCacheFactoryUnitTest
 {
     /** Verify that we get the default. */
     @Test
-    public void testCreateRemoteHttpCacheClient_Bad()
+    void testCreateRemoteHttpCacheClient_Bad()
     {
         // SETUP
         final String remoteHttpClientClassName = "junk";
@@ -48,14 +50,14 @@ public void testCreateRemoteHttpCacheClient_Bad()
         final IRemoteHttpCacheClient<String, String> result = factory.createRemoteHttpCacheClientForAttributes( cattr );
 
         // VEIFY
-        assertNotNull( "Should have a cache.", result );
-        assertTrue( "Wrong default.", result instanceof RemoteHttpCacheClient );
-        assertTrue( "Should be initialized", ((RemoteHttpCacheClient<String, String>)result).isInitialized() );
+        Assertions.assertNotNull( result, "Should have a cache." );
+        assertInstanceOf( RemoteHttpCacheClient.class, result, "Wrong default." );
+        assertTrue( ( (RemoteHttpCacheClient<String, String>) result ).isInitialized(), "Should be initialized" );
     }
 
     /** Verify that we get the default. */
     @Test
-    public void testCreateRemoteHttpCacheClient_default()
+    void testCreateRemoteHttpCacheClient_default()
     {
         // SETUP
         final RemoteHttpCacheAttributes cattr = new RemoteHttpCacheAttributes();
@@ -65,29 +67,29 @@ public void testCreateRemoteHttpCacheClient_default()
         final IRemoteHttpCacheClient<String, String> result = factory.createRemoteHttpCacheClientForAttributes( cattr );
 
         // VEIFY
-        assertNotNull( "Should have a cache.", result );
-        assertTrue( "Wrong default.", result instanceof RemoteHttpCacheClient );
+        assertNotNull( result, "Should have a cache." );
+        assertInstanceOf( RemoteHttpCacheClient.class, result, "Wrong default." );
     }
 
     /** Verify that we get a cache no wait. */
     @Test
-    public void testGetCache_normal()
+    void testGetCache_normal()
     {
         // SETUP
         final ICompositeCacheManager cacheMgr = new MockCompositeCacheManager();
-        assertNotNull( "Should have a manager.", cacheMgr );
+        assertNotNull( cacheMgr, "Should have a manager." );
         final ICacheEventLogger cacheEventLogger = null;
         final IElementSerializer elementSerializer = null;
 
         final RemoteHttpCacheAttributes cattr = new RemoteHttpCacheAttributes();
-        assertNotNull( "Should have attributes.", cattr );
+        assertNotNull( cattr, "Should have attributes." );
         final RemoteHttpCacheFactory factory = new RemoteHttpCacheFactory();
-        assertNotNull( "Should have a factory.", factory );
+        assertNotNull( factory, "Should have a factory." );
 
         // DO WORK
         final AuxiliaryCache<String, String> result = factory.createCache(cattr, cacheMgr, cacheEventLogger, elementSerializer);
 
         // VERIFY
-        assertNotNull( "Should have a cache.", result );
+        assertNotNull( result, "Should have a cache." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheManualTester.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheManualTester.java
index 336c5990b..9cb62f3ad 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheManualTester.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheManualTester.java
@@ -19,15 +19,15 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /** Manual tester for a JCS instance configured to use the http client. */
-public class RemoteHttpCacheManualTester
+class RemoteHttpCacheManualTester
 {
     /** Number to use for the test */
     private static final int items = 100;
@@ -35,8 +35,8 @@ public class RemoteHttpCacheManualTester
     /**
      * Test setup
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
     {
         JCS.setConfigFilename( "/TestRemoteHttpCache.ccf" );
     }
@@ -46,7 +46,7 @@ public void setUp()
      * @throws Exception Description of the Exception
      */
     @Test
-    public void testSimpleLoad()
+    void testSimpleLoad()
         throws Exception
     {
         final CacheAccess<String, String> jcs = JCS.getInstance( "testCache1" );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServiceUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServiceUnitTest.java
index e4f1a5990..14803969c 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServiceUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServiceUnitTest.java
@@ -19,17 +19,17 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.HashSet;
 
 import org.apache.commons.jcs3.auxiliary.MockCacheEventLogger;
 import org.apache.commons.jcs3.engine.CacheElement;
 import org.apache.commons.jcs3.engine.control.MockCompositeCacheManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the service. */
-public class RemoteHttpCacheServiceUnitTest
+class RemoteHttpCacheServiceUnitTest
 {
     /**
      * Verify event log calls.
@@ -37,7 +37,7 @@ public class RemoteHttpCacheServiceUnitTest
      * @throws Exception
      */
     @Test
-    public void testGet_simple()
+    void testGet_simple()
         throws Exception
     {
         // SETUP
@@ -52,8 +52,8 @@ public void testGet_simple()
         server.get( "region", "key" );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -62,7 +62,7 @@ public void testGet_simple()
      * @throws Exception
      */
     @Test
-    public void testGetMatching_simple()
+    void testGetMatching_simple()
         throws Exception
     {
         // SETUP
@@ -77,8 +77,8 @@ public void testGetMatching_simple()
         server.getMatching( "region", "pattern", 0 );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -87,7 +87,7 @@ public void testGetMatching_simple()
      * @throws Exception
      */
     @Test
-    public void testGetMultiple_simple()
+    void testGetMultiple_simple()
         throws Exception
     {
         // SETUP
@@ -102,8 +102,8 @@ public void testGetMultiple_simple()
         server.getMultiple( "region", new HashSet<>() );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -112,7 +112,7 @@ public void testGetMultiple_simple()
      * @throws Exception
      */
     @Test
-    public void testRemove_simple()
+    void testRemove_simple()
         throws Exception
     {
         // SETUP
@@ -127,8 +127,8 @@ public void testRemove_simple()
         server.remove( "region", "key" );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -137,7 +137,7 @@ public void testRemove_simple()
      * @throws Exception
      */
     @Test
-    public void testRemoveAll_simple()
+    void testRemoveAll_simple()
         throws Exception
     {
         // SETUP
@@ -152,8 +152,8 @@ public void testRemoveAll_simple()
         server.removeAll( "region" );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -162,7 +162,7 @@ public void testRemoveAll_simple()
      * @throws Exception
      */
     @Test
-    public void testUpdate_simple()
+    void testUpdate_simple()
         throws Exception
     {
         // SETUP
@@ -182,7 +182,7 @@ public void testUpdate_simple()
         server.update( element, requesterId );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServletUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServletUnitTest.java
index 4c523bdd1..f1f154152 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServletUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServletUnitTest.java
@@ -19,9 +19,9 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -32,18 +32,19 @@
 import org.apache.commons.jcs3.auxiliary.remote.value.RemoteCacheRequest;
 import org.apache.commons.jcs3.auxiliary.remote.value.RemoteCacheResponse;
 import org.apache.commons.jcs3.engine.CacheElement;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the servlet. */
-public class RemoteHttpCacheServletUnitTest
+class RemoteHttpCacheServletUnitTest
 {
     private RemoteHttpCacheServlet servlet;
     private MockRemoteCacheService<Serializable, Serializable> remoteHttpCacheService;
 
-    @Before
-    public void setUp() throws Exception
+    @BeforeEach
+    void setUp()
+        throws Exception
     {
         servlet = new RemoteHttpCacheServlet();
         servlet.init(null);
@@ -52,15 +53,16 @@ public void setUp() throws Exception
         servlet.setRemoteCacheService( remoteHttpCacheService );
     }
 
-    @After
-    public void tearDown() throws Exception
+    @AfterEach
+    void tearDown()
+        throws Exception
     {
         servlet.destroy();
     }
 
     /** Verify that the service is called. */
     @Test
-    public void testProcessRequest_Get()
+    void testProcessRequest_Get()
     {
         final String cacheName = "test";
         final Serializable key = "key";
@@ -71,13 +73,13 @@ public void testProcessRequest_Get()
         final RemoteCacheResponse<Object> result = servlet.processRequest( request );
 
         // VERIFY
-        assertNotNull( "Should have a result.", result );
-        assertEquals( "Wrong key.", key, remoteHttpCacheService.lastGetKey );
+        assertNotNull( result, "Should have a result." );
+        assertEquals( key, remoteHttpCacheService.lastGetKey, "Wrong key." );
     }
 
     /** Verify that the service is called. */
     @Test
-    public void testProcessRequest_GetMatching()
+    void testProcessRequest_GetMatching()
     {
         final String cacheName = "test";
         final String pattern = "pattern";
@@ -89,13 +91,13 @@ public void testProcessRequest_GetMatching()
         final RemoteCacheResponse<Object> result = servlet.processRequest( request );
 
         // VERIFY
-        assertNotNull( "Should have a result.", result );
-        assertEquals( "Wrong pattern.", pattern, remoteHttpCacheService.lastGetMatchingPattern );
+        assertNotNull( result, "Should have a result." );
+        assertEquals( pattern, remoteHttpCacheService.lastGetMatchingPattern, "Wrong pattern." );
     }
 
     /** Verify that the service is called. */
     @Test
-    public void testProcessRequest_GetMultiple()
+    void testProcessRequest_GetMultiple()
     {
         final String cacheName = "test";
         final Set<Serializable> keys = Collections.emptySet();
@@ -107,14 +109,14 @@ public void testProcessRequest_GetMultiple()
         final RemoteCacheResponse<Object> result = servlet.processRequest( request );
 
         // VERIFY
-        assertNotNull( "Should have a result.", result );
-        assertEquals( "Wrong keys.", keys, remoteHttpCacheService.lastGetMultipleKeys );
+        assertNotNull( result, "Should have a result." );
+        assertEquals( keys, remoteHttpCacheService.lastGetMultipleKeys, "Wrong keys." );
 
     }
 
     /** Verify that we balk and return an error. */
     @Test
-    public void testProcessRequest_null()
+    void testProcessRequest_null()
     {
         final RemoteCacheRequest<Serializable, Serializable> request = null;
 
@@ -122,14 +124,16 @@ public void testProcessRequest_null()
         final RemoteCacheResponse<Object> result = servlet.processRequest( request );
 
         // VERIFY
-        assertNotNull( "Should have a result.", result );
-        assertTrue( "Should have 'The request is null' in the errorMessage", result.getErrorMessage().indexOf( "The request is null" ) != -1 );
-        assertTrue( "Should have 'The request is null' in the toString", result.toString().indexOf( "The request is null" ) != -1 );
+        assertNotNull( result, "Should have a result." );
+        assertTrue( result.getErrorMessage().indexOf( "The request is null" ) != -1,
+                    "Should have 'The request is null' in the errorMessage" );
+        assertTrue( result.toString().indexOf( "The request is null" ) != -1,
+                    "Should have 'The request is null' in the toString" );
     }
 
     /** Verify that the service is called. */
     @Test
-    public void testProcessRequest_Remove()
+    void testProcessRequest_Remove()
     {
         final String cacheName = "test";
         final Serializable key = "key";
@@ -140,13 +144,13 @@ public void testProcessRequest_Remove()
         final RemoteCacheResponse<Object> result = servlet.processRequest( request );
 
         // VERIFY
-        assertNotNull( "Should have a result.", result );
-        assertEquals( "Wrong key.", key, remoteHttpCacheService.lastRemoveKey );
+        assertNotNull( result, "Should have a result." );
+        assertEquals( key, remoteHttpCacheService.lastRemoveKey, "Wrong key." );
     }
 
     /** Verify that the service is called. */
     @Test
-    public void testProcessRequest_RemoveAll()
+    void testProcessRequest_RemoveAll()
     {
         final String cacheName = "testRemoveALl";
         final long requesterId = 2;
@@ -156,13 +160,13 @@ public void testProcessRequest_RemoveAll()
         final RemoteCacheResponse<Object> result = servlet.processRequest( request );
 
         // VERIFY
-        assertNotNull( "Should have a result.", result );
-        assertEquals( "Wrong cacheName.", cacheName, remoteHttpCacheService.lastRemoveAllCacheName );
+        assertNotNull( result, "Should have a result." );
+        assertEquals( cacheName, remoteHttpCacheService.lastRemoveAllCacheName, "Wrong cacheName." );
     }
 
     /** Verify that the service is called. */
     @Test
-    public void testProcessRequest_Update()
+    void testProcessRequest_Update()
     {
         final String cacheName = "test";
         final String key = "key";
@@ -174,7 +178,7 @@ public void testProcessRequest_Update()
         final RemoteCacheResponse<Object> result = servlet.processRequest( request );
 
         // VERIFY
-        assertNotNull( "Should have a result.", result );
-        assertEquals( "Wrong object.", element, remoteHttpCacheService.lastUpdate );
+        assertNotNull( result, "Should have a result." );
+        assertEquals( element, remoteHttpCacheService.lastUpdate, "Wrong object." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java
index d1857ae60..8fd0c5d6c 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java
@@ -19,6 +19,10 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
@@ -37,22 +41,21 @@
 import org.apache.commons.jcs3.engine.control.MockElementSerializer;
 import org.apache.commons.jcs3.utils.net.HostNameUtil;
 import org.apache.commons.jcs3.utils.timing.SleepUtil;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
-
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 /**
  * These tests startup the remote server and make requests to it.
  */
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class BasicRemoteCacheClientServerUnitTest extends Assert
+@TestMethodOrder(MethodOrderer.MethodName.class)
+class BasicRemoteCacheClientServerUnitTest
 {
+
     private static final int LOCAL_PORT = 12020;
 
-   /**
+    /**
      * Server instance to use in the tests.
      */
     private static RemoteCacheServer<String, String> server;
@@ -63,26 +66,28 @@ public class BasicRemoteCacheClientServerUnitTest extends Assert
     private static RemoteCacheFactory factory;
 
     /**
-     * the remote server port
+     * The remote server port
      */
     private static int remotePort;
 
     /**
      * Starts the server. This is not in a setup, since the server is slow to kill right now.
      */
-    @BeforeClass
-    public static void setup()
+    @BeforeAll
+    static void setup()
     {
         // Add some debug to try and find out why test fails on Jenkins/Continuum
         try {
             final InetAddress lh = InetAddress.getByName("localhost");
-            System.out.println("localhost="+lh);
-            final InetAddress ina=InetAddress.getLocalHost();
-            System.out.println("InetAddress.getLocalHost()="+ina);
+            System.out.println( "localhost=" + lh );
+            final InetAddress ina = InetAddress.getLocalHost();
+            System.out.println( "InetAddress.getLocalHost()=" + ina );
+
             // Iterate all NICs (network interface cards)...
             final Enumeration<NetworkInterface> ifaces = NetworkInterface.getNetworkInterfaces();
-            if ( ifaces != null ) {
-            while ( ifaces.hasMoreElements() )
+            if ( ifaces != null )
+            {
+                while ( ifaces.hasMoreElements() )
                 {
                     final NetworkInterface iface = ifaces.nextElement();
                     // Iterate all IP addresses assigned to each card...
@@ -91,17 +96,17 @@ public static void setup()
                         final InetAddress inetAddr = inetAddrs.nextElement();
                         final boolean loopbackAddress = inetAddr.isLoopbackAddress();
                         final boolean siteLocalAddress = inetAddr.isSiteLocalAddress();
-                        System.out.println("Found: "+ inetAddr +
-                                " isLoopback: " + loopbackAddress +
-                                " isSiteLocal: " + siteLocalAddress +
-                                (!loopbackAddress && siteLocalAddress ? " *" : ""));
+                        System.out.println( "Found: " + inetAddr +
+                                                " isLoopback: " + loopbackAddress +
+                                                " isSiteLocal: " + siteLocalAddress +
+                                                ( !loopbackAddress && siteLocalAddress ? " *" : "" ) );
                     }
                 }
             }
         } catch (final Exception e) {
             e.printStackTrace();
         }
-        // end of debug
+        // End of debug
         final String configFile = "TestRemoteCacheClientServer.ccf";
         server = RemoteCacheServerStartupUtil.startServerUsingProperties(configFile);
         factory = new RemoteCacheFactory();
@@ -109,8 +114,9 @@ public static void setup()
         remotePort = server.remoteCacheServerAttributes.getRemoteLocation().getPort();
     }
 
-    @AfterClass
-    public static void stop() throws IOException
+    @AfterAll
+    static void stop()
+        throws IOException
     {
         if (server != null) { // in case setup failed, no point throwing NPE as well
             server.shutdown("localhost", remotePort);
@@ -121,22 +127,13 @@ public static void stop() throws IOException
      * Verify that we can start the remote cache server. Send an item to the remote. Verify that the
      * remote put count goes up. If we go through JCS, the manager will be shared and we will get
      * into an endless loop. We will use a mock cache manager instead.
-     * <p>
-     * The remote server uses the real JCS. We can verify that items are added to JCS behind the
-     * server by calling get. We cannot access it directly via JCS since it is serialized.
-     * <p>
-     * This test uses a mock injected client to test a normal server.
-     * <p>
-     *
-     * @throws Exception
      */
     @Test
-    public void test1SinglePut()
-            throws Exception
-            {
+    void test1SinglePut()
+        throws Exception
+    {
         // SETUP
         final MockCompositeCacheManager compositeCacheManager = new MockCompositeCacheManager();
-
         final RemoteCacheAttributes attributes = new RemoteCacheAttributes();
         attributes.setRemoteLocation("localhost", remotePort);
         attributes.setLocalPort(LOCAL_PORT);
@@ -152,45 +149,31 @@ public void test1SinglePut()
         SleepUtil.sleepAtLeast(200);
 
         // VERIFY
-        try
-        {
-            assertEquals("Cache is alive", CacheStatus.ALIVE, cache.getStatus());
-            assertEquals("Wrong number of puts", 1, server.getPutCount() - numPutsPrior);
-        }
-        catch (final junit.framework.AssertionFailedError e)
-        {
-            System.out.println(cache.getStats());
-            System.out.println(server.getStats());
-            throw e;
-        }
+        assertEquals( CacheStatus.ALIVE, cache.getStatus(), "Cache is alive" );
+        assertEquals( 1, server.getPutCount() - numPutsPrior, "Wrong number of puts" );
 
         // DO WORK
         final ICacheElement<String, String> result = cache.get("key");
 
         // VERIFY
-        assertEquals("Wrong element.", element.getVal(), result.getVal());
-            }
+        assertEquals( element.getVal(), result.getVal(), "Wrong element." );
+    }
 
     /**
      * Verify that we can remove an item via the remote server.
-     * <p>
-     *
-     * @throws Exception
      */
     @Test
-    public void test2PutRemove()
-            throws Exception
-            {
+    void test2PutRemove()
+        throws Exception
+    {
         // SETUP
         final MockCompositeCacheManager compositeCacheManager = new MockCompositeCacheManager();
-
         final RemoteCacheAttributes attributes = new RemoteCacheAttributes();
         attributes.setRemoteLocation("localhost", remotePort);
         attributes.setLocalPort(LOCAL_PORT);
         attributes.setCacheName("testPutRemove");
 
         final MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger();
-
         final RemoteCacheManager remoteCacheManager = factory.getManager(attributes, compositeCacheManager, cacheEventLogger, null);
         final AuxiliaryCache<String, String> cache = remoteCacheManager.getCache(attributes);
 
@@ -201,23 +184,14 @@ public void test2PutRemove()
         SleepUtil.sleepAtLeast(50);
 
         // VERIFY
-        try
-        {
-            assertEquals("Cache is alive", CacheStatus.ALIVE, cache.getStatus());
-            assertEquals("Wrong number of puts", 1, server.getPutCount() - numPutsPrior);
-        }
-        catch (final junit.framework.AssertionFailedError e)
-        {
-            System.out.println(cache.getStats());
-            System.out.println(server.getStats());
-            throw e;
-        }
+        assertEquals( CacheStatus.ALIVE, cache.getStatus(), "Cache is alive" );
+        assertEquals( 1, server.getPutCount() - numPutsPrior, "Wrong number of puts" );
 
         // DO WORK
         final ICacheElement<String, String> result = cache.get("key");
 
         // VERIFY
-        assertEquals("Wrong element.", element.getVal(), result.getVal());
+        assertEquals( element.getVal(), result.getVal(), "Wrong element." );
 
         // DO WORK
         cache.remove("key");
@@ -225,21 +199,18 @@ public void test2PutRemove()
         final ICacheElement<String, String> resultAfterRemote = cache.get("key");
 
         // VERIFY
-        assertNull("Element resultAfterRemote should be null.", resultAfterRemote);
-            }
+        assertNull( resultAfterRemote, "Element resultAfterRemote should be null." );
+    }
 
     /**
      * Register a listener with the server. Send an update. Verify that the listener received it.
-     *
-     * @throws Exception
      */
     @Test
-    public void test3PutAndListen()
-            throws Exception
-            {
+    void test3PutAndListen()
+        throws Exception
+    {
         // SETUP
         final MockCompositeCacheManager compositeCacheManager = new MockCompositeCacheManager();
-
         final RemoteCacheAttributes attributes = new RemoteCacheAttributes();
         attributes.setRemoteLocation("localhost", remotePort);
         attributes.setLocalPort(LOCAL_PORT);
@@ -258,37 +229,23 @@ public void test3PutAndListen()
         SleepUtil.sleepAtLeast(50);
 
         // VERIFY
-        try
-        {
-            assertEquals("Cache is alive", CacheStatus.ALIVE, cache.getStatus());
-            assertEquals("Wrong number of puts", 1, server.getPutCount() - numPutsPrior);
-            assertEquals("Wrong number of puts to listener.", 1, listener.putCount);
-        }
-        catch (final junit.framework.AssertionFailedError e)
-        {
-            System.out.println(cache.getStats());
-            System.out.println(server.getStats());
-            throw e;
-        }
-        finally
-        {
-            // remove from all regions.
-            server.removeCacheListener(listener);
-        }
+        assertEquals( CacheStatus.ALIVE, cache.getStatus(), "Cache is alive" );
+        assertEquals( 1, server.getPutCount() - numPutsPrior, "Wrong number of puts" );
+        assertEquals( 1, listener.putCount, "Wrong number of puts to listener." );
+
+        // Clean up
+        server.removeCacheListener( listener );
     }
 
     /**
-     * Register a listener with the server. Send an update. Verify that the listener received it.
-     *
-     * @throws Exception
+     * Register a listener with the server. Send multiple updates. Verify that the listener received them.
      */
     @Test
-    public void test4PutaMultipleAndListen()
-            throws Exception
+    void test4PutaMultipleAndListen()
+        throws Exception
     {
         // SETUP
         final MockCompositeCacheManager compositeCacheManager = new MockCompositeCacheManager();
-
         final RemoteCacheAttributes attributes = new RemoteCacheAttributes();
         attributes.setRemoteLocation("localhost", remotePort);
         attributes.setLocalPort(LOCAL_PORT);
@@ -303,34 +260,29 @@ public void test4PutaMultipleAndListen()
         // DO WORK
         final int numPutsPrior = server.getPutCount();
         final int numToPut = 100;
-        for (int i = 0; i < numToPut; i++)
+        for ( int i = 0; i < numToPut; i++ )
         {
-            final ICacheElement<String, String> element = new CacheElement<>(cache.getCacheName(), "key" + 1, "value" + i);
+            final ICacheElement<String, String> element = new CacheElement<>( cache.getCacheName(), "key" + i,
+                                                                              "value" + i );
             cache.update(element);
         }
         SleepUtil.sleepAtLeast(500);
 
         // VERIFY
-        try
-        {
-            assertEquals("Cache is alive", CacheStatus.ALIVE, cache.getStatus());
-            assertEquals("Wrong number of puts", numToPut, server.getPutCount() - numPutsPrior);
-            assertEquals("Wrong number of puts to listener.", numToPut, listener.putCount);
-        }
-        catch (final junit.framework.AssertionFailedError e)
-        {
-            System.out.println(cache.getStats());
-            System.out.println(server.getStats());
-            throw e;
-        }
+        assertEquals( CacheStatus.ALIVE, cache.getStatus(), "Cache is alive" );
+        assertEquals( numToPut, server.getPutCount() - numPutsPrior, "Wrong number of puts" );
+        assertEquals( numToPut, listener.putCount, "Wrong number of puts to listener." );
     }
 
     @Test
-    public void testLocalHost() throws Exception
+    void testLocalHost()
+        throws Exception
     {
         final InetAddress byName = InetAddress.getByName("localhost");
-        assertTrue("Expected localhost (" + byName.getHostAddress() + ") to be a loopback address", byName.isLoopbackAddress());
+        assertTrue( byName.isLoopbackAddress(),
+                    "Expected localhost (" + byName.getHostAddress() + ") to be a loopback address" );
         final InetAddress localHost = HostNameUtil.getLocalHostLANAddress();
-        assertTrue("Expected getLocalHostLANAddress() (" + localHost + ") to return a site local address", localHost.isSiteLocalAddress());
+        assertTrue( localHost.isSiteLocalAddress(),
+                    "Expected getLocalHostLANAddress() (" + localHost + ") to return a site local address" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerAttributesUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerAttributesUnitTest.java
index ce9d48acd..f91df92de 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerAttributesUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerAttributesUnitTest.java
@@ -19,49 +19,49 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.apache.commons.jcs3.auxiliary.remote.server.behavior.RemoteType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the remote cache server attributes.
  */
-public class RemoteCacheServerAttributesUnitTest
+class RemoteCacheServerAttributesUnitTest
 {
 
     /**
      * Verify that the type is set correctly and that the correct name is returned for the type.
      */
     @Test
-    public void testSetRemoteTypeName_cluster()
+    void testSetRemoteTypeName_cluster()
     {
         final RemoteCacheServerAttributes attributes = new RemoteCacheServerAttributes();
         attributes.setRemoteTypeName( "CLUSTER" );
-        assertEquals( "Wrong type.", RemoteType.CLUSTER, attributes.getRemoteType() );
-        assertEquals( "Wrong name", "CLUSTER", attributes.getRemoteTypeName() );
+        assertEquals( RemoteType.CLUSTER, attributes.getRemoteType(), "Wrong type." );
+        assertEquals( "CLUSTER", attributes.getRemoteTypeName(), "Wrong name" );
     }
 
     /**
      * Verify that the type is set correctly and that the correct name is returned for the type.
      */
     @Test
-    public void testSetRemoteTypeName_local()
+    void testSetRemoteTypeName_local()
     {
         final RemoteCacheServerAttributes attributes = new RemoteCacheServerAttributes();
         attributes.setRemoteTypeName( "LOCAL" );
-        assertEquals( "Wrong type.", RemoteType.LOCAL, attributes.getRemoteType() );
-        assertEquals( "Wrong name", "LOCAL", attributes.getRemoteTypeName() );
+        assertEquals( RemoteType.LOCAL, attributes.getRemoteType(), "Wrong type." );
+        assertEquals( "LOCAL", attributes.getRemoteTypeName(), "Wrong name" );
     }
 
     /**
      * Verify that we get a string, even if not attributes are set.
      */
     @Test
-    public void testToString()
+    void testToString()
     {
         final RemoteCacheServerAttributes attributes = new RemoteCacheServerAttributes();
-        assertNotNull( "Should have a string.", attributes.toString() );
+        assertNotNull( attributes.toString(), "Should have a string." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerFactoryUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerFactoryUnitTest.java
index 8ce215dfc..8a38e4eb9 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerFactoryUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerFactoryUnitTest.java
@@ -19,22 +19,22 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.rmi.server.RMISocketFactory;
 import java.util.Properties;
 
 import org.apache.commons.jcs3.auxiliary.remote.behavior.ICommonRemoteCacheAttributes;
 import org.apache.commons.jcs3.auxiliary.remote.behavior.IRemoteCacheConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the factory */
-public class RemoteCacheServerFactoryUnitTest
+class RemoteCacheServerFactoryUnitTest
 {
     /** Verify that we get the timeout value */
     @Test
-    public void testConfigureObjectSpecificCustomFactory_withProperty()
+    void testConfigureObjectSpecificCustomFactory_withProperty()
     {
         // SETUP
         final String testValue = "123245";
@@ -46,13 +46,13 @@ public void testConfigureObjectSpecificCustomFactory_withProperty()
         final RMISocketFactory result = RemoteCacheServerFactory.configureObjectSpecificCustomFactory( props );
 
         // VERIFY
-        assertNotNull( "Should have a custom socket factory.", result );
-        assertEquals( "Wrong testValue", testValue, ((MockRMISocketFactory)result).getTestStringProperty() );
+        assertNotNull( result, "Should have a custom socket factory." );
+        assertEquals( testValue, ( (MockRMISocketFactory) result ).getTestStringProperty(), "Wrong testValue" );
     }
 
     /** Verify that we get the timeout value */
     @Test
-    public void testConfigureObjectSpecificCustomFactory_withProperty_TimeoutConfigurableRMIScoketFactory()
+    void testConfigureObjectSpecificCustomFactory_withProperty_TimeoutConfigurableRMIScoketFactory()
     {
         // SETUP
         final int readTimeout = 1234;
@@ -66,14 +66,16 @@ public void testConfigureObjectSpecificCustomFactory_withProperty_TimeoutConfigu
         final RMISocketFactory result = RemoteCacheServerFactory.configureObjectSpecificCustomFactory( props );
 
         // VERIFY
-        assertNotNull( "Should have a custom socket factory.", result );
-        assertEquals( "Wrong readTimeout", readTimeout, ((TimeoutConfigurableRMISocketFactory)result).getReadTimeout() );
-        assertEquals( "Wrong readTimeout", openTimeout, ((TimeoutConfigurableRMISocketFactory)result).getOpenTimeout() );
+        assertNotNull( result, "Should have a custom socket factory." );
+        assertEquals( readTimeout, ( (TimeoutConfigurableRMISocketFactory) result ).getReadTimeout(),
+                      "Wrong readTimeout" );
+        assertEquals( openTimeout, ( (TimeoutConfigurableRMISocketFactory) result ).getOpenTimeout(),
+                      "Wrong readTimeout" );
     }
 
     /** Verify that we get the startRegistry value */
     @Test
-    public void testConfigureRemoteCacheServerAttributes_allowClusterGetPresent()
+    void testConfigureRemoteCacheServerAttributes_allowClusterGetPresent()
     {
         // SETUP
         final boolean allowClusterGet = false;
@@ -84,12 +86,12 @@ public void testConfigureRemoteCacheServerAttributes_allowClusterGetPresent()
         final RemoteCacheServerAttributes result = RemoteCacheServerFactory.configureRemoteCacheServerAttributes( props );
 
         // VERIFY
-        assertEquals( "Wrong allowClusterGet", allowClusterGet, result.isAllowClusterGet() );
+        assertEquals( allowClusterGet, result.isAllowClusterGet(), "Wrong allowClusterGet" );
     }
 
     /** Verify that we get the timeout value */
     @Test
-    public void testConfigureRemoteCacheServerAttributes_eventQueuePoolName()
+    void testConfigureRemoteCacheServerAttributes_eventQueuePoolName()
     {
         // SETUP
         final String eventQueuePoolName = "specialName";
@@ -100,12 +102,12 @@ public void testConfigureRemoteCacheServerAttributes_eventQueuePoolName()
         final RemoteCacheServerAttributes result = RemoteCacheServerFactory.configureRemoteCacheServerAttributes( props );
 
         // VERIFY
-        assertEquals( "Wrong eventQueuePoolName", eventQueuePoolName, result.getEventQueuePoolName() );
+        assertEquals( eventQueuePoolName, result.getEventQueuePoolName(), "Wrong eventQueuePoolName" );
     }
 
     /** Verify that we get the startRegistry value */
     @Test
-    public void testConfigureRemoteCacheServerAttributes_localClusterConsistencyPresent()
+    void testConfigureRemoteCacheServerAttributes_localClusterConsistencyPresent()
     {
         // SETUP
         final boolean localClusterConsistency = false;
@@ -116,12 +118,12 @@ public void testConfigureRemoteCacheServerAttributes_localClusterConsistencyPres
         final RemoteCacheServerAttributes result = RemoteCacheServerFactory.configureRemoteCacheServerAttributes( props );
 
         // VERIFY
-        assertEquals( "Wrong localClusterConsistency", localClusterConsistency, result.isLocalClusterConsistency() );
+        assertEquals( localClusterConsistency, result.isLocalClusterConsistency(), "Wrong localClusterConsistency" );
     }
 
     /** Verify that we get the registryKeepAliveDelayMillis value */
     @Test
-    public void testConfigureRemoteCacheServerAttributes_registryKeepAliveDelayMillisPresent()
+    void testConfigureRemoteCacheServerAttributes_registryKeepAliveDelayMillisPresent()
     {
         // SETUP
         final int registryKeepAliveDelayMillis = 123245;
@@ -132,12 +134,13 @@ public void testConfigureRemoteCacheServerAttributes_registryKeepAliveDelayMilli
         final RemoteCacheServerAttributes result = RemoteCacheServerFactory.configureRemoteCacheServerAttributes( props );
 
         // VERIFY
-        assertEquals( "Wrong registryKeepAliveDelayMillis", registryKeepAliveDelayMillis, result.getRegistryKeepAliveDelayMillis() );
+        assertEquals( registryKeepAliveDelayMillis, result.getRegistryKeepAliveDelayMillis(),
+                      "Wrong registryKeepAliveDelayMillis" );
     }
 
     /** Verify that we get the registryKeepAliveDelayMillis value */
     @Test
-    public void testConfigureRemoteCacheServerAttributes_rmiSocketFactoryTimeoutMillisPresent()
+    void testConfigureRemoteCacheServerAttributes_rmiSocketFactoryTimeoutMillisPresent()
     {
         // SETUP
         final int rmiSocketFactoryTimeoutMillis = 123245;
@@ -148,12 +151,13 @@ public void testConfigureRemoteCacheServerAttributes_rmiSocketFactoryTimeoutMill
         final RemoteCacheServerAttributes result = RemoteCacheServerFactory.configureRemoteCacheServerAttributes( props );
 
         // VERIFY
-        assertEquals( "Wrong rmiSocketFactoryTimeoutMillis", rmiSocketFactoryTimeoutMillis, result.getRmiSocketFactoryTimeoutMillis() );
+        assertEquals( rmiSocketFactoryTimeoutMillis, result.getRmiSocketFactoryTimeoutMillis(),
+                      "Wrong rmiSocketFactoryTimeoutMillis" );
     }
 
     /** Verify that we get the timeout value */
     @Test
-    public void testConfigureRemoteCacheServerAttributes_timeoutNotPresent()
+    void testConfigureRemoteCacheServerAttributes_timeoutNotPresent()
     {
         // SETUP
         final Properties props = new Properties();
@@ -162,12 +166,13 @@ public void testConfigureRemoteCacheServerAttributes_timeoutNotPresent()
         final RemoteCacheServerAttributes result = RemoteCacheServerFactory.configureRemoteCacheServerAttributes( props );
 
         // VERIFY
-        assertEquals( "Wrong timeout", ICommonRemoteCacheAttributes.DEFAULT_RMI_SOCKET_FACTORY_TIMEOUT_MILLIS, result.getRmiSocketFactoryTimeoutMillis() );
+        assertEquals( ICommonRemoteCacheAttributes.DEFAULT_RMI_SOCKET_FACTORY_TIMEOUT_MILLIS,
+                      result.getRmiSocketFactoryTimeoutMillis(), "Wrong timeout" );
     }
 
     /** Verify that we get the useRegistryKeepAlive value */
     @Test
-    public void testConfigureRemoteCacheServerAttributes_useRegistryKeepAlivePresent()
+    void testConfigureRemoteCacheServerAttributes_useRegistryKeepAlivePresent()
     {
         // SETUP
         final boolean useRegistryKeepAlive = false;
@@ -178,6 +183,6 @@ public void testConfigureRemoteCacheServerAttributes_useRegistryKeepAlivePresent
         final RemoteCacheServerAttributes result = RemoteCacheServerFactory.configureRemoteCacheServerAttributes( props );
 
         // VERIFY
-        assertEquals( "Wrong useRegistryKeepAlive", useRegistryKeepAlive, result.isUseRegistryKeepAlive() );
+        assertEquals( useRegistryKeepAlive, result.isUseRegistryKeepAlive(), "Wrong useRegistryKeepAlive" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerUnitTest.java
index 08d444c4a..47b878e4f 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerUnitTest.java
@@ -19,8 +19,8 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -35,23 +35,24 @@
 import org.apache.commons.jcs3.engine.CacheElement;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
 import org.apache.commons.jcs3.utils.timing.SleepUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Since the server does not know that it is a server, it is easy to unit test. The factory does all
  * the rmi work.
  */
-public class RemoteCacheServerUnitTest
+class RemoteCacheServerUnitTest
 {
     private static final String expectedIp1 = "adfasdf";
     private static final String expectedIp2 = "adsfadsafaf";
 
     private RemoteCacheServer<String, String> server;
 
-    @Before
-    public void setUp() throws Exception
+    @BeforeEach
+    void setUp()
+        throws Exception
     {
         final IRemoteCacheServerAttributes rcsa = new RemoteCacheServerAttributes();
         rcsa.setConfigFileName( "/TestRemoteCacheServer.ccf" );
@@ -59,8 +60,9 @@ public void setUp() throws Exception
         this.server = new RemoteCacheServer<>( rcsa, config );
     }
 
-    @After
-    public void tearDown() throws Exception
+    @AfterEach
+    void tearDown()
+        throws Exception
     {
         this.server.shutdown();
     }
@@ -73,7 +75,7 @@ public void tearDown() throws Exception
      * @throws Exception
      */
     @Test
-    public void testAddListener_ToAllThenRemove()
+    void testAddListener_ToAllThenRemove()
         throws Exception
     {
         final MockRemoteCacheListener<String, String> mockListener1 = new MockRemoteCacheListener<>();
@@ -86,13 +88,13 @@ public void testAddListener_ToAllThenRemove()
         server.addCacheListener( cacheName, mockListener2 );
 
         // VERIFY
-        assertEquals( "Wrong number of listeners.", 2, server.getCacheListeners( cacheName ).eventQMap.size() );
-        assertEquals( "Wrong listener id.", 1, mockListener1.getListenerId() );
-        assertEquals( "Wrong listener id.", 2, mockListener2.getListenerId() );
+        assertEquals( 2, server.getCacheListeners( cacheName ).eventQMap.size(), "Wrong number of listeners." );
+        assertEquals( 1, mockListener1.getListenerId(), "Wrong listener id." );
+        assertEquals( 2, mockListener2.getListenerId(), "Wrong listener id." );
 
         // DO WORK
         server.removeCacheListener( cacheName, mockListener1.getListenerId() );
-        assertEquals( "Wrong number of listeners.", 1, server.getCacheListeners( cacheName ).eventQMap.size() );
+        assertEquals( 1, server.getCacheListeners( cacheName ).eventQMap.size(), "Wrong number of listeners." );
     }
 
     /**
@@ -103,7 +105,7 @@ public void testAddListener_ToAllThenRemove()
      * @throws Exception
      */
     @Test
-    public void testAddListener_ToAllThenRemove_clusterType()
+    void testAddListener_ToAllThenRemove_clusterType()
         throws Exception
     {
         final MockRemoteCacheListener<String, String> mockListener1 = new MockRemoteCacheListener<>();
@@ -118,15 +120,15 @@ public void testAddListener_ToAllThenRemove_clusterType()
         server.addCacheListener( cacheName, mockListener2 );
 
         // VERIFY
-        assertEquals( "Wrong number of listeners.", 0, server.getCacheListeners( cacheName ).eventQMap.size() );
-        assertEquals( "Wrong number of listeners.", 2, server.getClusterListeners( cacheName ).eventQMap.size() );
-        assertEquals( "Wrong listener id.", 1, mockListener1.getListenerId() );
-        assertEquals( "Wrong listener id.", 2, mockListener2.getListenerId() );
+        assertEquals( 0, server.getCacheListeners( cacheName ).eventQMap.size(), "Wrong number of listeners." );
+        assertEquals( 2, server.getClusterListeners( cacheName ).eventQMap.size(), "Wrong number of listeners." );
+        assertEquals( 1, mockListener1.getListenerId(), "Wrong listener id." );
+        assertEquals( 2, mockListener2.getListenerId(), "Wrong listener id." );
 
         // DO WORK
         server.removeCacheListener( cacheName, mockListener1.getListenerId() );
-        assertEquals( "Wrong number of listeners.", 1, server.getClusterListeners( cacheName ).eventQMap.size() );
-        assertNull( "Should be no entry in the ip map.", server.getExtraInfoForRequesterId( 1 ) );
+        assertEquals( 1, server.getClusterListeners( cacheName ).eventQMap.size(), "Wrong number of listeners." );
+        assertNull( server.getExtraInfoForRequesterId( 1 ), "Should be no entry in the ip map." );
     }
 
     // TODO: This test only works if preconfigured remote caches exist. Need to fix.
@@ -163,7 +165,7 @@ public void testAddListener_ToAllThenRemove_clusterType()
      * @throws Exception
      */
     @Test
-    public void testAddListenerToCache_CLUSTERtype()
+    void testAddListenerToCache_CLUSTERtype()
         throws Exception
     {
         final MockRemoteCacheListener<String, String> mockListener1 = new MockRemoteCacheListener<>();
@@ -180,10 +182,10 @@ public void testAddListenerToCache_CLUSTERtype()
         server.addCacheListener( cacheName, mockListener2 );
 
         // VERIFY
-        assertEquals( "Wrong listener id.", 1, mockListener1.getListenerId() );
-        assertEquals( "Wrong listener id.", 2, mockListener2.getListenerId() );
-        assertEquals( "Wrong ip.", expectedIp1, server.getExtraInfoForRequesterId( 1 ) );
-        assertEquals( "Wrong ip.", expectedIp2, server.getExtraInfoForRequesterId( 2 ) );
+        assertEquals( 1, mockListener1.getListenerId(), "Wrong listener id." );
+        assertEquals( 2, mockListener2.getListenerId(), "Wrong listener id." );
+        assertEquals( expectedIp1, server.getExtraInfoForRequesterId( 1 ), "Wrong ip." );
+        assertEquals( expectedIp2, server.getExtraInfoForRequesterId( 2 ), "Wrong ip." );
     }
 
     /**
@@ -193,7 +195,7 @@ public void testAddListenerToCache_CLUSTERtype()
      * @throws Exception
      */
     @Test
-    public void testAddListenerToCache_LOCALtype()
+    void testAddListenerToCache_LOCALtype()
         throws Exception
     {
         final MockRemoteCacheListener<String, String> mockListener1 = new MockRemoteCacheListener<>();
@@ -210,10 +212,10 @@ public void testAddListenerToCache_LOCALtype()
         server.addCacheListener( cacheName, mockListener2 );
 
         // VERIFY
-        assertEquals( "Wrong listener id.", 1, mockListener1.getListenerId() );
-        assertEquals( "Wrong listener id.", 2, mockListener2.getListenerId() );
-        assertEquals( "Wrong ip.", expectedIp1, server.getExtraInfoForRequesterId( 1 ) );
-        assertEquals( "Wrong ip.", expectedIp2, server.getExtraInfoForRequesterId( 2 ) );
+        assertEquals( 1, mockListener1.getListenerId(), "Wrong listener id." );
+        assertEquals( 2, mockListener2.getListenerId(), "Wrong listener id." );
+        assertEquals( expectedIp1, server.getExtraInfoForRequesterId( 1 ), "Wrong ip." );
+        assertEquals( expectedIp2, server.getExtraInfoForRequesterId( 2 ), "Wrong ip." );
     }
 
     /**
@@ -222,7 +224,7 @@ public void testAddListenerToCache_LOCALtype()
      * @throws Exception
      */
     @Test
-    public void testGet_simple()
+    void testGet_simple()
         throws Exception
     {
         final MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger();
@@ -232,8 +234,8 @@ public void testGet_simple()
         server.get( "region", "key" );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -242,7 +244,7 @@ public void testGet_simple()
      * @throws Exception
      */
     @Test
-    public void testGetMatching_simple()
+    void testGetMatching_simple()
         throws Exception
     {
         final MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger();
@@ -252,8 +254,8 @@ public void testGetMatching_simple()
         server.getMatching( "region", "pattern", 0 );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -262,7 +264,7 @@ public void testGetMatching_simple()
      * @throws Exception
      */
     @Test
-    public void testGetMultiple_simple()
+    void testGetMultiple_simple()
         throws Exception
     {
         final MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger();
@@ -272,8 +274,8 @@ public void testGetMultiple_simple()
         server.getMultiple( "region", new HashSet<>() );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -282,7 +284,7 @@ public void testGetMultiple_simple()
      * @throws Exception
      */
     @Test
-    public void testRemove_simple()
+    void testRemove_simple()
         throws Exception
     {
         final MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger();
@@ -292,8 +294,8 @@ public void testRemove_simple()
         server.remove( "region", "key" );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -302,7 +304,7 @@ public void testRemove_simple()
      * @throws Exception
      */
     @Test
-    public void testRemoveAll_simple()
+    void testRemoveAll_simple()
         throws Exception
     {
         final MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger();
@@ -312,8 +314,8 @@ public void testRemoveAll_simple()
         server.removeAll( "region" );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 
     /**
@@ -322,7 +324,7 @@ public void testRemoveAll_simple()
      * @throws Exception
      */
     @Test
-    public void testSimpleRegisterListenerAndPut()
+    void testSimpleRegisterListenerAndPut()
         throws Exception
     {
         final IRemoteCacheServerAttributes rcsa = new RemoteCacheServerAttributes();
@@ -351,10 +353,10 @@ public void testSimpleRegisterListenerAndPut()
         Thread.sleep( 100 );
 
         // VERIFY
-        assertEquals( "Wrong number of items put to listener.", numToPut, mockListener.putItems.size() );
+        assertEquals( numToPut, mockListener.putItems.size(), "Wrong number of items put to listener." );
         for ( int i = 0; i < numToPut; i++ )
         {
-            assertEquals( "Wrong item.", inputItems.get( i ), mockListener.putItems.get( i ) );
+            assertEquals( inputItems.get( i ), mockListener.putItems.get( i ), "Wrong item." );
         }
 
         server.shutdown();
@@ -368,7 +370,7 @@ public void testSimpleRegisterListenerAndPut()
      * @throws Exception
      */
     @Test
-    public void testSimpleRegisterListenerAndPut_FromClusterWithLCC()
+    void testSimpleRegisterListenerAndPut_FromClusterWithLCC()
         throws Exception
     {
         // SETUP
@@ -407,10 +409,10 @@ public void testSimpleRegisterListenerAndPut_FromClusterWithLCC()
         SleepUtil.sleepAtLeast( 200 );
 
         // VERIFY
-        assertEquals( "Wrong number of items put to listener.", numToPut, localListener.putItems.size() );
+        assertEquals( numToPut, localListener.putItems.size(), "Wrong number of items put to listener." );
         for ( int i = 0; i < numToPut; i++ )
         {
-            assertEquals( "Wrong item.", inputItems.get( i ), localListener.putItems.get( i ) );
+            assertEquals( inputItems.get( i ), localListener.putItems.get( i ), "Wrong item." );
         }
 
         server.shutdown();
@@ -422,7 +424,7 @@ public void testSimpleRegisterListenerAndPut_FromClusterWithLCC()
      * @throws Exception
      */
     @Test
-    public void testSimpleRegisterListenerAndRemove()
+    void testSimpleRegisterListenerAndRemove()
         throws Exception
     {
         final MockRemoteCacheListener<String, String> mockListener = new MockRemoteCacheListener<>();
@@ -444,10 +446,10 @@ public void testSimpleRegisterListenerAndRemove()
         Thread.sleep( 100 );
 
         // VERIFY
-        assertEquals( "Wrong number of items removed from listener.", numToPut, mockListener.removedKeys.size() );
+        assertEquals( numToPut, mockListener.removedKeys.size(), "Wrong number of items removed from listener." );
         for ( int i = 0; i < numToPut; i++ )
         {
-            assertEquals( "Wrong key.", String.valueOf( i ), mockListener.removedKeys.get( i ) );
+            assertEquals( String.valueOf( i ), mockListener.removedKeys.get( i ), "Wrong key." );
         }
     }
 
@@ -457,7 +459,7 @@ public void testSimpleRegisterListenerAndRemove()
      * @throws Exception
      */
     @Test
-    public void testUpdate_simple()
+    void testUpdate_simple()
         throws Exception
     {
         final MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger();
@@ -469,7 +471,7 @@ public void testUpdate_simple()
         server.update( item );
 
         // VERIFY
-        assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
-        assertEquals( "End should have been called.", 1, cacheEventLogger.endICacheEventCalls );
+        assertEquals( 1, cacheEventLogger.startICacheEventCalls, "Start should have been called." );
+        assertEquals( 1, cacheEventLogger.endICacheEventCalls, "End should have been called." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/TimeoutConfigurableRMISocketFactoryUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/TimeoutConfigurableRMISocketFactoryUnitTest.java
index e21e52650..258ff9a74 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/TimeoutConfigurableRMISocketFactoryUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/TimeoutConfigurableRMISocketFactoryUnitTest.java
@@ -23,10 +23,10 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the custom factory */
-public class TimeoutConfigurableRMISocketFactoryUnitTest
+class TimeoutConfigurableRMISocketFactoryUnitTest
 {
     /**
      * Simple test to see that we can create a server socket and connect.
@@ -34,7 +34,8 @@ public class TimeoutConfigurableRMISocketFactoryUnitTest
      * @throws IOException
      */
     @Test
-    public void testCreateAndConnect() throws IOException
+    void testCreateAndConnect()
+        throws IOException
     {
         // SETUP
         final int port = 3455;
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/util/RemoteCacheRequestFactoryUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/util/RemoteCacheRequestFactoryUnitTest.java
index 3bdd1f842..1620da083 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/util/RemoteCacheRequestFactoryUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/util/RemoteCacheRequestFactoryUnitTest.java
@@ -19,8 +19,8 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -29,14 +29,14 @@
 import org.apache.commons.jcs3.auxiliary.remote.value.RemoteCacheRequest;
 import org.apache.commons.jcs3.auxiliary.remote.value.RemoteRequestType;
 import org.apache.commons.jcs3.engine.CacheElement;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the request creator. */
-public class RemoteCacheRequestFactoryUnitTest
+class RemoteCacheRequestFactoryUnitTest
 {
     /** Simple test */
     @Test
-    public void testCreateGetMatchingRequest_Normal()
+    void testCreateGetMatchingRequest_Normal()
     {
         // SETUP
         final String cacheName = "test";
@@ -48,14 +48,14 @@ public void testCreateGetMatchingRequest_Normal()
             RemoteCacheRequestFactory.createGetMatchingRequest( cacheName, pattern, requesterId );
 
         // VERIFY
-        assertNotNull( "Should have a result", result );
-        assertEquals( "Wrong cacheName", cacheName, result.getCacheName() );
-        assertEquals( "Wrong type", RemoteRequestType.GET_MATCHING, result.getRequestType() );
+        assertNotNull( result, "Should have a result" );
+        assertEquals( cacheName, result.getCacheName(), "Wrong cacheName" );
+        assertEquals( RemoteRequestType.GET_MATCHING, result.getRequestType(), "Wrong type" );
     }
 
     /** Simple test */
     @Test
-    public void testCreateGetMultipleRequest_Normal()
+    void testCreateGetMultipleRequest_Normal()
     {
         // SETUP
         final String cacheName = "test";
@@ -67,14 +67,14 @@ public void testCreateGetMultipleRequest_Normal()
             RemoteCacheRequestFactory.createGetMultipleRequest( cacheName, keys, requesterId );
 
         // VERIFY
-        assertNotNull( "Should have a result", result );
-        assertEquals( "Wrong cacheName", cacheName, result.getCacheName() );
-        assertEquals( "Wrong type", RemoteRequestType.GET_MULTIPLE, result.getRequestType() );
+        assertNotNull( result, "Should have a result" );
+        assertEquals( cacheName, result.getCacheName(), "Wrong cacheName" );
+        assertEquals( RemoteRequestType.GET_MULTIPLE, result.getRequestType(), "Wrong type" );
     }
 
     /** Simple test */
     @Test
-    public void testCreateGetRequest_Normal()
+    void testCreateGetRequest_Normal()
     {
         // SETUP
         final String cacheName = "test";
@@ -86,14 +86,14 @@ public void testCreateGetRequest_Normal()
             RemoteCacheRequestFactory.createGetRequest( cacheName, key, requesterId );
 
         // VERIFY
-        assertNotNull( "Should have a result", result );
-        assertEquals( "Wrong cacheName", cacheName, result.getCacheName() );
-        assertEquals( "Wrong type", RemoteRequestType.GET, result.getRequestType() );
+        assertNotNull( result, "Should have a result" );
+        assertEquals( cacheName, result.getCacheName(), "Wrong cacheName" );
+        assertEquals( RemoteRequestType.GET, result.getRequestType(), "Wrong type" );
     }
 
     /** Simple test */
     @Test
-    public void testCreateRemoveAllRequest_Normal()
+    void testCreateRemoveAllRequest_Normal()
     {
         // SETUP
         final String cacheName = "test";
@@ -104,14 +104,14 @@ public void testCreateRemoveAllRequest_Normal()
             RemoteCacheRequestFactory.createRemoveAllRequest( cacheName, requesterId );
 
         // VERIFY
-        assertNotNull( "Should have a result", result );
-        assertEquals( "Wrong cacheName", cacheName, result.getCacheName() );
-        assertEquals( "Wrong type", RemoteRequestType.REMOVE_ALL, result.getRequestType() );
+        assertNotNull( result, "Should have a result" );
+        assertEquals( cacheName, result.getCacheName(), "Wrong cacheName" );
+        assertEquals( RemoteRequestType.REMOVE_ALL, result.getRequestType(), "Wrong type" );
     }
 
     /** Simple test */
     @Test
-    public void testCreateRemoveRequest_Normal()
+    void testCreateRemoveRequest_Normal()
     {
         // SETUP
         final String cacheName = "test";
@@ -123,14 +123,14 @@ public void testCreateRemoveRequest_Normal()
             .createRemoveRequest( cacheName, key, requesterId );
 
         // VERIFY
-        assertNotNull( "Should have a result", result );
-        assertEquals( "Wrong cacheName", cacheName, result.getCacheName() );
-        assertEquals( "Wrong type", RemoteRequestType.REMOVE, result.getRequestType() );
+        assertNotNull( result, "Should have a result" );
+        assertEquals( cacheName, result.getCacheName(), "Wrong cacheName" );
+        assertEquals( RemoteRequestType.REMOVE, result.getRequestType(), "Wrong type" );
     }
 
     /** Simple test */
     @Test
-    public void testCreateUpdateRequest_Normal()
+    void testCreateUpdateRequest_Normal()
     {
         // SETUP
         final String cacheName = "test";
@@ -145,8 +145,8 @@ public void testCreateUpdateRequest_Normal()
             RemoteCacheRequestFactory.createUpdateRequest( element, requesterId );
 
         // VERIFY
-        assertNotNull( "Should have a result", result );
-        assertEquals( "Wrong cacheName", cacheName, result.getCacheName() );
-        assertEquals( "Wrong type", RemoteRequestType.UPDATE, result.getRequestType() );
+        assertNotNull( result, "Should have a result" );
+        assertEquals( cacheName, result.getCacheName(), "Wrong cacheName" );
+        assertEquals( RemoteRequestType.UPDATE, result.getRequestType(), "Wrong type" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/CacheEventQueueFactoryUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/CacheEventQueueFactoryUnitTest.java
index 9f575ce83..953ed2c47 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/CacheEventQueueFactoryUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/CacheEventQueueFactoryUnitTest.java
@@ -19,22 +19,22 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.commons.jcs3.auxiliary.remote.MockRemoteCacheListener;
 import org.apache.commons.jcs3.engine.behavior.ICacheEventQueue;
 import org.apache.commons.jcs3.engine.behavior.ICacheEventQueue.QueueType;
 import org.apache.commons.jcs3.engine.behavior.ICacheListener;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the CacheEventQueueFactory */
-public class CacheEventQueueFactoryUnitTest
+class CacheEventQueueFactoryUnitTest
 {
     /** Test create */
     @Test
-    public void testCreateCacheEventQueue_Pooled()
+    void testCreateCacheEventQueue_Pooled()
     {
         // SETUP
         final QueueType eventQueueType = QueueType.POOLED;
@@ -47,13 +47,13 @@ public void testCreateCacheEventQueue_Pooled()
         final ICacheEventQueue<String, String> result = factory.createCacheEventQueue( listener, listenerId, "cacheName", "threadPoolName", eventQueueType );
 
         // VERIFY
-        assertNotNull( "Should have a result", result );
-        assertTrue( "Wrong type", result.getQueueType() == QueueType.POOLED );
+        assertNotNull( result, "Should have a result" );
+        assertTrue( result.getQueueType() == QueueType.POOLED, "Wrong type" );
     }
 
     /** Test create */
     @Test
-    public void testCreateCacheEventQueue_Single()
+    void testCreateCacheEventQueue_Single()
     {
         // SETUP
         final QueueType eventQueueType = QueueType.SINGLE;
@@ -66,7 +66,7 @@ public void testCreateCacheEventQueue_Single()
         final ICacheEventQueue<String, String> result = factory.createCacheEventQueue( listener, listenerId, "cacheName", "threadPoolName", eventQueueType );
 
         // VERIFY
-        assertNotNull( "Should have a result", result );
-        assertEquals( "Wrong type", QueueType.SINGLE, result.getQueueType() );
+        assertNotNull( result, "Should have a result" );
+        assertEquals( QueueType.SINGLE, result.getQueueType(), "Wrong type" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/EventQueueConcurrentLoadTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/EventQueueConcurrentLoadTest.java
index 64f93ce9d..3d60b6fc3 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/EventQueueConcurrentLoadTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/EventQueueConcurrentLoadTest.java
@@ -19,68 +19,45 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import junit.extensions.ActiveTestSuite;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
 import org.apache.commons.jcs3.engine.behavior.ICacheListener;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * This test case is designed to makes sure there are no deadlocks in the event queue. The time to
  * live should be set to a very short interval to make a deadlock more likely.
  */
-public class EventQueueConcurrentLoadTest
+class EventQueueConcurrentLoadTest
 {
-    /**
-     * This is a dummy cache listener to use when testing the event queue.
-     */
+
+    // Dummy cache listener to use when testing the event queue
     protected static class CacheListenerImpl<K, V>
         implements ICacheListener<K, V>
     {
-        /**
-         * <code>putCount</code>
-         */
-        protected AtomicInteger putCount = new AtomicInteger();
 
-        /**
-         * <code>removeCount</code>
-         */
+        protected AtomicInteger putCount = new AtomicInteger();
         protected AtomicInteger removeCount = new AtomicInteger();
 
-        /**
-         * @return 0
-         * @throws IOException
-         */
         @Override
         public long getListenerId()
             throws IOException
         {
-            // TODO Auto-generated method stub
             return 0;
         }
 
-        /**
-         * @param cacheName
-         * @throws IOException
-         */
         @Override
         public void handleDispose( final String cacheName )
             throws IOException
         {
-            // TODO Auto-generated method stub
+            // No implementation needed for this test
         }
 
-        /**
-         * @param item
-         * @throws IOException
-         */
         @Override
         public void handlePut( final ICacheElement<K, V> item )
             throws IOException
@@ -88,11 +65,6 @@ public void handlePut( final ICacheElement<K, V> item )
             putCount.incrementAndGet();
         }
 
-        /**
-         * @param cacheName
-         * @param key
-         * @throws IOException
-         */
         @Override
         public void handleRemove( final String cacheName, final K key )
             throws IOException
@@ -100,49 +72,83 @@ public void handleRemove( final String cacheName, final K key )
             removeCount.incrementAndGet();
         }
 
-        /**
-         * @param cacheName
-         * @throws IOException
-         */
         @Override
         public void handleRemoveAll( final String cacheName )
             throws IOException
         {
-            // TODO Auto-generated method stub
+            // No implementation needed for this test
         }
 
-        /**
-         * @param id
-         * @throws IOException
-         */
         @Override
         public void setListenerId( final long id )
             throws IOException
         {
-            // TODO Auto-generated method stub
+            // No implementation needed for this test
         }
     }
 
-    /** The queue implementation */
     private static CacheEventQueue<String, String> queue;
-
-    /** The mock listener */
     private static CacheListenerImpl<String, String> listen;
 
-    /** Max failure setting */
     private static final int maxFailure = 3;
-
-    /** Time to wait before retrying on failure. */
     private static final int waitBeforeRetry = 100;
-
-    /** Very small idle time */
     private static final int idleTime = 2;
 
+    @BeforeEach
+    void setUp()
+    {
+        listen = new CacheListenerImpl<>();
+        queue = new CacheEventQueue<>( listen, 1L, "testCache1", maxFailure, waitBeforeRetry );
+        queue.setWaitToDieMillis( idleTime );
+    }
+
     /**
      * Test putting and a delay. Waits until queue is empty to start.
-     * @param end
-     * @param expectedPutCount
-     * @throws Exception
+     */
+    @Test
+    void testRunPutTest1()
+        throws Exception
+    {
+        runPutTest( 200, 200 );
+    }
+
+    @Test
+    void testRunPutTest2()
+        throws Exception
+    {
+        runPutTest( 1200, 1400 );
+    }
+
+    @Test
+    void testRunRemoveTest1()
+        throws Exception
+    {
+        runRemoveTest( 2200 );
+    }
+
+    @Test
+    void testRunPutTest4()
+        throws Exception
+    {
+        runPutTest( 5200, 6600 );
+    }
+
+    @Test
+    void testRunRemoveTest2()
+        throws Exception
+    {
+        runRemoveTest( 5200 );
+    }
+
+    @Test
+    void testRunPutDelayTest()
+        throws Exception
+    {
+        runPutDelayTest( 100, 6700 );
+    }
+
+    /**
+     * Test putting items with a delay.
      */
     public static void runPutDelayTest( final int end, final int expectedPutCount )
         throws Exception
@@ -157,7 +163,6 @@ public static void runPutDelayTest( final int end, final int expectedPutCount )
         }
         System.out.println( "queue is empty, begin" );
 
-        // get it going
         final CacheElement<String, String> elem = new CacheElement<>( "testCache1", "a:key", "adata" );
         queue.addPutEvent( elem );
 
@@ -190,18 +195,12 @@ public static void runPutDelayTest( final int end, final int expectedPutCount )
 
         Thread.sleep( 1000 );
 
-        // this becomes less accurate with each test. It should never fail. If
-        // it does things are very off.
-        assertTrue( "The put count [" + listen.putCount + "] is below the expected minimum threshold ["
-            + expectedPutCount + "]", listen.putCount.get() >= expectedPutCount - 1 );
-
+        assertTrue( listen.putCount.get() >= expectedPutCount - 1,
+                    "The put count [" + listen.putCount + "] is below the expected minimum threshold [" + expectedPutCount + "]" );
     }
 
     /**
      * Adds put events to the queue.
-     * @param end
-     * @param expectedPutCount
-     * @throws Exception
      */
     public static void runPutTest( final int end, final int expectedPutCount )
         throws Exception
@@ -222,17 +221,12 @@ public static void runPutTest( final int end, final int expectedPutCount )
         }
         System.out.println( "queue is empty, comparing putCount" );
 
-        // this becomes less accurate with each test. It should never fail. If
-        // it does things are very off.
-        assertTrue( "The put count [" + listen.putCount + "] is below the expected minimum threshold ["
-            + expectedPutCount + "]", listen.putCount.get() >= expectedPutCount - 1 );
-
+        assertTrue( listen.putCount.get() >= expectedPutCount - 1,
+                    "The put count [" + listen.putCount + "] is below the expected minimum threshold [" + expectedPutCount + "]" );
     }
 
     /**
      * Add remove events to the event queue.
-     * @param end
-     * @throws Exception
      */
     public static void runRemoveTest( final int end )
         throws Exception
@@ -241,88 +235,5 @@ public static void runRemoveTest( final int end )
         {
             queue.addRemoveEvent( i + ":key" );
         }
-
-    }
-
-    /**
-     * A unit test suite for JUnit
-     * @return The test suite
-     */
-    public static Test suite()
-    {
-        final ActiveTestSuite suite = new ActiveTestSuite();
-
-        suite.addTest(new TestCase("testRunPutTest1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runPutTest( 200, 200 );
-            }
-        });
-
-        suite.addTest(new TestCase("testRunPutTest2" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runPutTest( 1200, 1400 );
-            }
-        });
-
-        suite.addTest(new TestCase("testRunRemoveTest1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runRemoveTest( 2200 );
-            }
-        });
-
-        suite.addTest(new TestCase("testRunPutTest4" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runPutTest( 5200, 6600 );
-            }
-        });
-
-        suite.addTest(new TestCase("testRunRemoveTest2" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runRemoveTest( 5200 );
-            }
-        });
-
-        suite.addTest(new TestCase("testRunPutDelayTest" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runPutDelayTest( 100, 6700 );
-            }
-        });
-
-        return suite;
-    }
-
-    /**
-     * Test setup. Create the static queue to be used by all tests
-     */
-    @Before
-    public void setUp()
-    {
-        listen = new CacheListenerImpl<>();
-        queue = new CacheEventQueue<>( listen, 1L, "testCache1", maxFailure, waitBeforeRetry );
-        queue.setWaitToDieMillis( idleTime );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/SystemPropertyUsageUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/SystemPropertyUsageUnitTest.java
index 9927a0da4..2063cf3bd 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/SystemPropertyUsageUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/SystemPropertyUsageUnitTest.java
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Properties;
 
@@ -27,30 +27,32 @@
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.engine.control.CompositeCacheManager;
 import org.apache.commons.jcs3.utils.props.PropertyLoader;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Verify that system properties can override.
  */
-public class SystemPropertyUsageUnitTest
+class SystemPropertyUsageUnitTest
 {
     private static final String JCS_DEFAULT_CACHEATTRIBUTES_MAX_OBJECTS = "jcs.default.cacheattributes.MaxObjects";
     private static final int testValue = 6789;
 
     private CompositeCacheManager manager;
 
-    @Before
-    public void setUp() throws Exception
+    @BeforeEach
+    void setUp()
+        throws Exception
     {
        //First shut down any previously running manager.
        manager = CompositeCacheManager.getInstance();
        manager.shutDown();
     }
 
-    @After
-    public void tearDown() throws Exception
+    @AfterEach
+    void tearDown()
+        throws Exception
 	{
 		if (manager != null)
 		{
@@ -60,12 +62,12 @@ public void tearDown() throws Exception
         System.clearProperty(JCS_DEFAULT_CACHEATTRIBUTES_MAX_OBJECTS);
 	}
 
-	/**
+    /**
      * Verify that the system properties are used.
      * @throws Exception
      */
     @Test
-    public void testSystemPropertyUsage()
+    void testSystemPropertyUsage()
         throws Exception
     {
         System.setProperty( JCS_DEFAULT_CACHEATTRIBUTES_MAX_OBJECTS, String.valueOf(testValue) );
@@ -76,7 +78,7 @@ public void testSystemPropertyUsage()
 
         manager = CompositeCacheManager.getInstance();
 
-        assertEquals( "System property value is not reflected.", testValue, jcs.getCacheAttributes().getMaxObjects());
+        assertEquals( testValue, jcs.getCacheAttributes().getMaxObjects(), "System property value is not reflected." );
     }
 
     /**
@@ -85,7 +87,7 @@ public void testSystemPropertyUsage()
      * @throws Exception
      */
     @Test
-    public void testSystemPropertyUsage_inactive()
+    void testSystemPropertyUsage_inactive()
         throws Exception
     {
         System.setProperty( JCS_DEFAULT_CACHEATTRIBUTES_MAX_OBJECTS, String.valueOf(testValue) );
@@ -98,8 +100,8 @@ public void testSystemPropertyUsage_inactive()
 
         final CacheAccess<String, String> jcs = JCS.getInstance( "someCacheNotInFile" );
 
-        assertEquals( "System property value should not be reflected",
-                      Integer.parseInt( props.getProperty( JCS_DEFAULT_CACHEATTRIBUTES_MAX_OBJECTS ) ),
-                      jcs.getCacheAttributes().getMaxObjects());
+        assertEquals( Integer.parseInt( props.getProperty( JCS_DEFAULT_CACHEATTRIBUTES_MAX_OBJECTS ) ),
+                      jcs.getCacheAttributes().getMaxObjects(),
+                      "System property value should not be reflected" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocalUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocalUnitTest.java
index 0682f7c8d..bf9d12ba6 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocalUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocalUnitTest.java
@@ -19,16 +19,16 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the zombie remote cache service.
  */
-public class ZombieCacheServiceNonLocalUnitTest
+class ZombieCacheServiceNonLocalUnitTest
 {
     /**
      * Verify that a removeAll event gets added and then is sent to the service passed to propagate.
@@ -36,7 +36,7 @@ public class ZombieCacheServiceNonLocalUnitTest
      * @throws Exception
      */
     @Test
-    public void testRemoveAllThenWalk()
+    void testRemoveAllThenWalk()
         throws Exception
     {
         // SETUP
@@ -51,7 +51,7 @@ public void testRemoveAllThenWalk()
         zombie.propagateEvents( service );
 
         // VERIFY
-        assertEquals( "Updated element is not as expected.", cacheName, service.lastRemoveAllCacheName );
+        assertEquals( cacheName, service.lastRemoveAllCacheName, "Updated element is not as expected." );
     }
 
     /**
@@ -60,7 +60,7 @@ public void testRemoveAllThenWalk()
      * @throws Exception
      */
     @Test
-    public void testRemoveThenWalk()
+    void testRemoveThenWalk()
         throws Exception
     {
         // SETUP
@@ -76,7 +76,7 @@ public void testRemoveThenWalk()
         zombie.propagateEvents( service );
 
         // VERIFY
-        assertEquals( "Updated element is not as expected.", key, service.lastRemoveKey );
+        assertEquals( key, service.lastRemoveKey, "Updated element is not as expected." );
     }
 
     /**
@@ -85,7 +85,7 @@ public void testRemoveThenWalk()
      * @throws Exception
      */
     @Test
-    public void testUpdateThenWalk()
+    void testUpdateThenWalk()
         throws Exception
     {
         // SETUP
@@ -101,7 +101,7 @@ public void testUpdateThenWalk()
         zombie.propagateEvents( service );
 
         // VERIFY
-        assertEquals( "Updated element is not as expected.", element, service.lastUpdate );
+        assertEquals( element, service.lastUpdate, "Updated element is not as expected." );
     }
 
     /**
@@ -110,7 +110,7 @@ public void testUpdateThenWalk()
      * @throws Exception
      */
     @Test
-    public void testUpdateThenWalk_zeroSize()
+    void testUpdateThenWalk_zeroSize()
         throws Exception
     {
         // SETUP
@@ -126,6 +126,6 @@ public void testUpdateThenWalk_zeroSize()
         zombie.propagateEvents( service );
 
         // VERIFY
-        assertNull( "Nothing should have been put to the service.", service.lastUpdate );
+        assertNull( service.lastUpdate, "Nothing should have been put to the service." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CacheManagerStatsUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CacheManagerStatsUnitTest.java
index 55cda2174..c89079e3d 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CacheManagerStatsUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CacheManagerStatsUnitTest.java
@@ -19,16 +19,16 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.apache.commons.jcs3.engine.stats.behavior.ICacheStats;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  */
-public class CacheManagerStatsUnitTest
+class CacheManagerStatsUnitTest
 {
 
     /**
@@ -37,7 +37,8 @@ public class CacheManagerStatsUnitTest
      * @throws Exception
      */
     @Test
-    public void testSimpleGetStats() throws Exception
+    void testSimpleGetStats()
+        throws Exception
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testCache1" );
 
@@ -55,9 +56,9 @@ public void testSimpleGetStats() throws Exception
 
 //        System.out.println( statsString );
 
-        assertTrue( "Should have the cacheName in here.", statsString.indexOf("testCache1") != -1 );
-        assertTrue( "Should have the HitCountRam in here.", statsString.indexOf("HitCountRam") != -1 );
-        assertTrue( "Should have the 4 in here.", statsString.indexOf("4") != -1 );
+        assertTrue( statsString.indexOf( "testCache1" ) != -1, "Should have the cacheName in here." );
+        assertTrue( statsString.indexOf( "HitCountRam" ) != -1, "Should have the HitCountRam in here." );
+        assertTrue( statsString.indexOf( "4" ) != -1, "Should have the 4 in here." );
 
         final ICacheStats[] stats = mgr.getStatistics();
         final int statsLen = stats.length;
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfiguratorUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfiguratorUnitTest.java
index e83340648..cda3e06aa 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfiguratorUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfiguratorUnitTest.java
@@ -19,8 +19,8 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.Properties;
 
@@ -30,16 +30,16 @@
 import org.apache.commons.jcs3.auxiliary.MockAuxiliaryCacheAttributes;
 import org.apache.commons.jcs3.auxiliary.MockAuxiliaryCacheFactory;
 import org.apache.commons.jcs3.engine.logging.MockCacheEventLogger;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the configurator. */
-public class CompositeCacheConfiguratorUnitTest
+class CompositeCacheConfiguratorUnitTest
 {
     /**
      * Verify that we can parse the event logger correctly
      */
     @Test
-    public void testParseAuxiliary_CacheEventLogger_Normal()
+    void testParseAuxiliary_CacheEventLogger_Normal()
     {
         // SETUP
         final String regionName = "MyRegion";
@@ -65,15 +65,15 @@ public void testParseAuxiliary_CacheEventLogger_Normal()
         final MockAuxiliaryCache<String, String> result = (MockAuxiliaryCache<String, String>)aux;
 
         // VERIFY
-        assertNotNull( "Should have an auxcache.", result );
-        assertNotNull( "Should have an event logger.", result.getCacheEventLogger() );
+        assertNotNull( result, "Should have an auxcache." );
+        assertNotNull( result.getCacheEventLogger(), "Should have an event logger." );
     }
 
     /**
      * Verify that we can parse the spool chunk size
      */
     @Test
-    public void testParseSpoolChunkSize_Normal()
+    void testParseSpoolChunkSize_Normal()
     {
         // SETUP
         final String regionName = "MyRegion";
@@ -90,6 +90,6 @@ public void testParseSpoolChunkSize_Normal()
 
         // VERIFY
         final CompositeCache<String, String> cache = manager.getCache( regionName );
-        assertEquals( "Wrong chunkSize", cache.getCacheAttributes().getSpoolChunkSize(), chunkSize );
+        assertEquals( cache.getCacheAttributes().getSpoolChunkSize(), chunkSize, "Wrong chunkSize" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheDiskUsageUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheDiskUsageUnitTest.java
index b394260d6..1feb3796b 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheDiskUsageUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheDiskUsageUnitTest.java
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -44,13 +44,13 @@
 import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
 import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
 import org.apache.commons.jcs3.engine.stats.behavior.IStats;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests of the disk usage settings for the CompositeCache.
  */
-public class CompositeCacheDiskUsageUnitTest
+class CompositeCacheDiskUsageUnitTest
 {
     /**
      * Used to test the disk cache functionality.
@@ -253,8 +253,8 @@ public void update( final ICacheElement<K, V> ce )
     /**
      * Test setup
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
     {
         JCS.setConfigFilename( "/TestDiskCacheUsagePattern.ccf" );
     }
@@ -264,7 +264,7 @@ public void setUp()
      * item is put to disk.
      */
     @Test
-    public void testSpoolAllowed()
+    void testSpoolAllowed()
     {
         // SETUP
         final ICompositeCacheAttributes cattr = new CompositeCacheAttributes();
@@ -285,8 +285,8 @@ public void testSpoolAllowed()
         cache.spoolToDisk( inputElement );
 
         // VERIFY
-        assertEquals( "Wrong number of calls to the disk cache update.", 1, mock.updateCount );
-        assertEquals( "Wrong element updated.", inputElement, mock.lastUpdatedItem );
+        assertEquals( 1, mock.updateCount, "Wrong number of calls to the disk cache update." );
+        assertEquals( inputElement, mock.lastUpdatedItem, "Wrong element updated." );
     }
 
     /**
@@ -294,7 +294,7 @@ public void testSpoolAllowed()
      * item is not put to disk.
      */
     @Test
-    public void testSpoolNotAllowed()
+    void testSpoolNotAllowed()
     {
         // SETUP
         final ICompositeCacheAttributes cattr = new CompositeCacheAttributes();
@@ -315,7 +315,7 @@ public void testSpoolNotAllowed()
         cache.spoolToDisk( inputElement );
 
         // VERIFY
-        assertEquals( "Wrong number of calls to the disk cache update.", 0, mock.updateCount );
+        assertEquals( 0, mock.updateCount, "Wrong number of calls to the disk cache update." );
     }
 
     /**
@@ -324,7 +324,7 @@ public void testSpoolNotAllowed()
      * @throws CacheException
      */
     @Test
-    public void testSwapConfig()
+    void testSwapConfig()
         throws CacheException
     {
         final CacheAccess<String, String> swap = JCS.getInstance( "Swap" );
@@ -341,7 +341,7 @@ public void testSwapConfig()
      * @throws IOException
      */
     @Test
-    public void testUpdateAllowed()
+    void testUpdateAllowed()
         throws IOException
     {
         // SETUP
@@ -363,8 +363,8 @@ public void testUpdateAllowed()
         cache.updateAuxiliaries( inputElement, true );
 
         // VERIFY
-        assertEquals( "Wrong number of calls to the disk cache update.", 1, mock.updateCount );
-        assertEquals( "Wrong element updated.", inputElement, mock.lastUpdatedItem );
+        assertEquals( 1, mock.updateCount, "Wrong number of calls to the disk cache update." );
+        assertEquals( inputElement, mock.lastUpdatedItem, "Wrong element updated." );
     }
 
     /**
@@ -377,7 +377,7 @@ public void testUpdateAllowed()
      * @throws IOException
      */
     @Test
-    public void testUpdateAllowed_localFalse()
+    void testUpdateAllowed_localFalse()
         throws IOException
     {
         // SETUP
@@ -399,8 +399,8 @@ public void testUpdateAllowed_localFalse()
         cache.updateAuxiliaries( inputElement, false );
 
         // VERIFY
-        assertEquals( "Wrong number of calls to the disk cache update.", 1, mock.updateCount );
-        assertEquals( "Wrong element updated.", inputElement, mock.lastUpdatedItem );
+        assertEquals( 1, mock.updateCount, "Wrong number of calls to the disk cache update." );
+        assertEquals( inputElement, mock.lastUpdatedItem, "Wrong element updated." );
     }
 
     /**
@@ -412,7 +412,7 @@ public void testUpdateAllowed_localFalse()
      * @throws IOException
      */
     @Test
-    public void testUpdateAllowed_withOtherCaches()
+    void testUpdateAllowed_withOtherCaches()
         throws IOException
     {
         // SETUP
@@ -437,11 +437,11 @@ public void testUpdateAllowed_withOtherCaches()
         cache.updateAuxiliaries( inputElement, false );
 
         // VERIFY
-        assertEquals( "Wrong number of calls to the disk cache update.", 1, mock.updateCount );
-        assertEquals( "Wrong element updated.", inputElement, mock.lastUpdatedItem );
+        assertEquals( 1, mock.updateCount, "Wrong number of calls to the disk cache update." );
+        assertEquals( inputElement, mock.lastUpdatedItem, "Wrong element updated." );
 
-        assertEquals( "Wrong number of calls to the lateral cache update.", 1, mockLateral.updateCount );
-        assertEquals( "Wrong element updated with lateral.", inputElement, mockLateral.lastUpdatedItem );
+        assertEquals( 1, mockLateral.updateCount, "Wrong number of calls to the lateral cache update." );
+        assertEquals( inputElement, mockLateral.lastUpdatedItem, "Wrong element updated with lateral." );
     }
 
     /**
@@ -450,7 +450,7 @@ public void testUpdateAllowed_withOtherCaches()
      * @throws CacheException
      */
     @Test
-    public void testUpdateConfig()
+    void testUpdateConfig()
         throws CacheException
     {
         final CacheAccess<String, String> swap = JCS.getInstance( "Update" );
@@ -468,7 +468,7 @@ public void testUpdateConfig()
      * @throws IOException
      */
     @Test
-    public void testUpdateNotAllowed()
+    void testUpdateNotAllowed()
         throws IOException
     {
         // SETUP
@@ -490,7 +490,7 @@ public void testUpdateNotAllowed()
         cache.updateAuxiliaries( inputElement, true );
 
         // VERIFY
-        assertEquals( "Wrong number of calls to the disk cache update.", 0, mock.updateCount );
+        assertEquals( 0, mock.updateCount, "Wrong number of calls to the disk cache update." );
     }
 
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheManagerTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheManagerTest.java
index b8721e7c5..f80456cff 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheManagerTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheManagerTest.java
@@ -19,21 +19,21 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.commons.jcs3.engine.CacheStatus;
 import org.apache.commons.jcs3.engine.CompositeCacheAttributes;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the composite cache manager */
-public class CompositeCacheManagerTest
+class CompositeCacheManagerTest
 {
 
     /**
      * Verify that calling release, when there are active clients, the caches are correctly disposed or not.
      */
     @Test
-    public void testRelease()
+    void testRelease()
     {
         // See JCS-184
         // create the manager
@@ -47,9 +47,9 @@ public void testRelease()
         // won't release as there are still clients. Only disposed when release() is called by
         // the last client
         manager.release();
-        assertEquals("The cache was disposed during release!", CacheStatus.ALIVE, cache.getStatus());
+        assertEquals( CacheStatus.ALIVE, cache.getStatus(), "The cache was disposed during release!" );
         manager.release();
-        assertEquals("The cache was NOT disposed during release!", CacheStatus.DISPOSED, cache.getStatus());
+        assertEquals( CacheStatus.DISPOSED, cache.getStatus(), "The cache was NOT disposed during release!" );
     }
 
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheUnitTest.java
index 92c499d0c..f8325b6f6 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/CompositeCacheUnitTest.java
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -34,12 +34,12 @@
 import org.apache.commons.jcs3.engine.behavior.ICompositeCacheAttributes;
 import org.apache.commons.jcs3.engine.behavior.IElementAttributes;
 import org.apache.commons.jcs3.engine.memory.MockMemoryCache;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests that directly engage the composite cache.
  */
-public class CompositeCacheUnitTest
+class CompositeCacheUnitTest
 {
     /**
      * Verify we can get some matching elements..
@@ -47,7 +47,7 @@ public class CompositeCacheUnitTest
      * @throws IOException
      */
     @Test
-    public void testGetMatching_Normal()
+    void testGetMatching_Normal()
         throws IOException
     {
         // SETUP
@@ -89,8 +89,8 @@ public void testGetMatching_Normal()
         final Map<?, ?> result2 = cache.getMatching( keyprefix2 + "\\S+" );
 
         // VERIFY
-        assertEquals( "Wrong number returned 1:", numToInsertPrefix1, result1.size() );
-        assertEquals( "Wrong number returned 2:", numToInsertPrefix2, result2.size() );
+        assertEquals( numToInsertPrefix1, result1.size(), "Wrong number returned 1:" );
+        assertEquals( numToInsertPrefix2, result2.size(), "Wrong number returned 2:" );
     }
 
     /**
@@ -99,7 +99,7 @@ public void testGetMatching_Normal()
      * @throws IOException
      */
     @Test
-    public void testGetMatching_NotOnDisk()
+    void testGetMatching_NotOnDisk()
         throws IOException
     {
         // SETUP
@@ -123,7 +123,7 @@ public void testGetMatching_NotOnDisk()
         cache.getMatching( "junk" );
 
         // VERIFY
-        assertEquals( "Wrong number of calls", 1, diskMock.getMatchingCallCount );
+        assertEquals( 1, diskMock.getMatchingCallCount, "Wrong number of calls" );
     }
 
     /**
@@ -132,7 +132,7 @@ public void testGetMatching_NotOnDisk()
      * @throws IOException
      */
     @Test
-    public void testGetMatching_NotOnRemote()
+    void testGetMatching_NotOnRemote()
         throws IOException
     {
         // SETUP
@@ -156,7 +156,7 @@ public void testGetMatching_NotOnRemote()
         cache.getMatching( "junk" );
 
         // VERIFY
-        assertEquals( "Wrong number of calls", 1, diskMock.getMatchingCallCount );
+        assertEquals( 1, diskMock.getMatchingCallCount, "Wrong number of calls" );
     }
 
     /**
@@ -166,7 +166,7 @@ public void testGetMatching_NotOnRemote()
      * @throws IOException
      */
     @Test
-    public void testShutdownMemoryFlush()
+    void testShutdownMemoryFlush()
         throws IOException
     {
         // SETUP
@@ -195,7 +195,7 @@ public void testShutdownMemoryFlush()
 
         // VERIFY
         final MockMemoryCache<String, Integer> memoryCache = (MockMemoryCache<String, Integer>) cache.getMemoryCache();
-        assertEquals( "Wrong number freed.", numToInsert, memoryCache.lastNumberOfFreedElements );
+        assertEquals( numToInsert, memoryCache.lastNumberOfFreedElements, "Wrong number freed." );
     }
 
     /**
@@ -205,7 +205,7 @@ public void testShutdownMemoryFlush()
      * @throws IOException
      */
     @Test
-    public void testShutdownMemoryFlush_noDisk()
+    void testShutdownMemoryFlush_noDisk()
         throws IOException
     {
         // SETUP
@@ -234,6 +234,6 @@ public void testShutdownMemoryFlush_noDisk()
 
         // VERIFY
         final MockMemoryCache<String, Integer> memoryCache = (MockMemoryCache<String, Integer>) cache.getMemoryCache();
-        assertEquals( "Wrong number freed.", 0, memoryCache.lastNumberOfFreedElements );
+        assertEquals( 0, memoryCache.lastNumberOfFreedElements, "Wrong number freed." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/event/SimpleEventHandlingUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/event/SimpleEventHandlingUnitTest.java
index ff54bfb4f..c4b0cbc79 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/event/SimpleEventHandlingUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/event/SimpleEventHandlingUnitTest.java
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
@@ -30,13 +30,13 @@
 import org.apache.commons.jcs3.engine.behavior.IElementAttributes;
 import org.apache.commons.jcs3.engine.control.event.behavior.IElementEvent;
 import org.apache.commons.jcs3.engine.control.event.behavior.IElementEventHandler;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * This test suite verifies that the basic ElementEvent are called as they should be.
  */
-public class SimpleEventHandlingUnitTest
+class SimpleEventHandlingUnitTest
 {
     /**
      * Simple event counter used to verify test results.
@@ -150,8 +150,8 @@ public synchronized <T> void handleElementEvent( final IElementEvent<T> event )
     /**
      * Test setup with expected configuration parameters.
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
     {
         JCS.setConfigFilename( "/TestSimpleEventHandling.ccf" );
         this.meh = new MyEventHandler();
@@ -162,7 +162,7 @@ public void setUp()
      * @throws Exception
      */
     @Test
-    public void testElementAttributesCreationTime()
+    void testElementAttributesCreationTime()
         throws Exception
     {
     	final ElementAttributes elem1 = new ElementAttributes();
@@ -173,7 +173,7 @@ public void testElementAttributesCreationTime()
     	final IElementAttributes elem2 = elem1.clone();
     	final long ctime2 = elem2.getCreateTime();
 
-    	assertFalse("Creation times should be different", ctime1 == ctime2);
+        assertFalse( ctime1 == ctime2, "Creation times should be different" );
     }
 
     /**
@@ -181,7 +181,7 @@ public void testElementAttributesCreationTime()
      * @throws Exception
      */
     @Test
-    public void testExceededIdletimeOnrequestEvent()
+    void testExceededIdletimeOnrequestEvent()
         throws Exception
     {
         final CacheAccess<String, String> jcs = JCS.getInstance( "Idletime" );
@@ -200,7 +200,7 @@ public void testExceededIdletimeOnrequestEvent()
         for ( int i = 0; i < 200; i++ )
         {
             final String value = jcs.get( i + ":key");
-            assertNotNull("Item should not be null for key " + i + ":key", value);
+            assertNotNull( value, "Item should not be null for key " + i + ":key" );
         }
 
         // wait a bit for the items to expire
@@ -209,15 +209,16 @@ public void testExceededIdletimeOnrequestEvent()
         for ( int i = 0; i < 200; i++ )
         {
             final String value = jcs.get( i + ":key");
-            assertNull("Item should be null for key " + i + ":key, but is " + value, value);
+            assertNull( value, "Item should be null for key " + i + ":key, but is " + value );
         }
 
         // wait a bit for it to finish
         Thread.sleep( 100 );
 
         // test to see if the count is right
-        assertTrue( "The number of ELEMENT_EVENT_EXCEEDED_IDLETIME_ONREQUEST events [" + meh.getExceededIdletimeCount()
-            + "] does not equal the number expected.", meh.getExceededIdletimeCount() >= 200 );
+        assertTrue( meh.getExceededIdletimeCount() >= 200,
+                    "The number of ELEMENT_EVENT_EXCEEDED_IDLETIME_ONREQUEST events [" + meh.getExceededIdletimeCount()
+                        + "] does not equal the number expected." );
     }
 
     /**
@@ -225,7 +226,7 @@ public void testExceededIdletimeOnrequestEvent()
      * @throws Exception
      */
     @Test
-    public void testExceededMaxlifeOnrequestEvent()
+    void testExceededMaxlifeOnrequestEvent()
         throws Exception
     {
         final CacheAccess<String, String> jcs = JCS.getInstance( "Maxlife" );
@@ -246,15 +247,16 @@ public void testExceededMaxlifeOnrequestEvent()
         for ( int i = 0; i < 200; i++ )
         {
             final String value = jcs.get( i + ":key");
-            assertNull("Item should be null for key " + i + ":key, but is " + value, value);
+            assertNull( value, "Item should be null for key " + i + ":key, but is " + value );
         }
 
         // wait a bit for it to finish
         Thread.sleep( 100 );
 
         // test to see if the count is right
-        assertTrue( "The number of ELEMENT_EVENT_EXCEEDED_MAXLIFE_ONREQUEST events [" + meh.getExceededMaxlifeCount()
-            + "] does not equal the number expected.", meh.getExceededMaxlifeCount() >= 200 );
+        assertTrue( meh.getExceededMaxlifeCount() >= 200,
+                    "The number of ELEMENT_EVENT_EXCEEDED_MAXLIFE_ONREQUEST events [" + meh.getExceededMaxlifeCount()
+                        + "] does not equal the number expected." );
     }
 
     /**
@@ -263,7 +265,7 @@ public void testExceededMaxlifeOnrequestEvent()
      * @throws Exception Description of the Exception
      */
     @Test
-    public void testSpoolEvent()
+    void testSpoolEvent()
         throws Exception
     {
         final CacheAccess<String, String> jcs = JCS.getInstance( "WithDisk" );
@@ -283,8 +285,9 @@ public void testSpoolEvent()
 
         // VERIFY
         // test to see if the count is right
-        assertTrue( "The number of ELEMENT_EVENT_SPOOLED_DISK_AVAILABLE events [" + meh.getSpoolCount()
-            + "] does not equal the number expected [" + items + "]", meh.getSpoolCount() >= items );
+        assertTrue( meh.getSpoolCount() >= items,
+                    "The number of ELEMENT_EVENT_SPOOLED_DISK_AVAILABLE events [" + meh.getSpoolCount()
+                        + "] does not equal the number expected [" + items + "]" );
     }
 
     /**
@@ -293,7 +296,7 @@ public void testSpoolEvent()
      * @throws Exception
      */
     @Test
-    public void testSpoolNoDiskEvent()
+    void testSpoolNoDiskEvent()
         throws Exception
     {
         final CacheAccess<String, String> jcs = JCS.getInstance( "NoDisk" );
@@ -313,8 +316,9 @@ public void testSpoolNoDiskEvent()
         Thread.sleep( items / 20 );
 
         // test to see if the count is right
-        assertTrue( "The number of ELEMENT_EVENT_SPOOLED_DISK_NOT_AVAILABLE events  [" + meh.getSpoolNoDiskCount()
-            + "] does not equal the number expected.", meh.getSpoolNoDiskCount() >= items );
+        assertTrue( meh.getSpoolNoDiskCount() >= items,
+                    "The number of ELEMENT_EVENT_SPOOLED_DISK_NOT_AVAILABLE events  [" + meh.getSpoolNoDiskCount()
+                        + "] does not equal the number expected." );
 
     }
 
@@ -323,7 +327,7 @@ public void testSpoolNoDiskEvent()
      * @throws Exception
      */
     @Test
-    public void testSpoolNotAllowedEvent()
+    void testSpoolNotAllowedEvent()
         throws Exception
     {
         final CacheAccess<String, String> jcs = JCS.getInstance( "DiskButNotAllowed" );
@@ -342,8 +346,9 @@ public void testSpoolNotAllowedEvent()
         Thread.sleep( items / 20 );
 
         // test to see if the count is right
-        assertTrue( "The number of ELEMENT_EVENT_SPOOLED_NOT_ALLOWED events [" + meh.getSpoolNotAllowedCount()
-            + "] does not equal the number expected.", meh.getSpoolNotAllowedCount() >= items );
+        assertTrue( meh.getSpoolNotAllowedCount() >= items,
+                    "The number of ELEMENT_EVENT_SPOOLED_NOT_ALLOWED events [" + meh.getSpoolNotAllowedCount()
+                        + "] does not equal the number expected." );
 
     }
 
@@ -352,7 +357,7 @@ public void testSpoolNotAllowedEvent()
      * @throws Exception
      */
     @Test
-    public void testSpoolNotAllowedEventOnItem()
+    void testSpoolNotAllowedEventOnItem()
         throws Exception
     {
         final CacheAccess<String, String> jcs = JCS.getInstance( "DiskButNotAllowed" );
@@ -373,8 +378,9 @@ public void testSpoolNotAllowedEventOnItem()
         Thread.sleep( items / 20 );
 
         // test to see if the count is right
-        assertTrue( "The number of ELEMENT_EVENT_SPOOLED_NOT_ALLOWED events [" + meh.getSpoolNotAllowedCount()
-            + "] does not equal the number expected.", meh.getSpoolNotAllowedCount() >= items );
+        assertTrue( meh.getSpoolNotAllowedCount() >= items,
+                    "The number of ELEMENT_EVENT_SPOOLED_NOT_ALLOWED events [" + meh.getSpoolNotAllowedCount()
+                        + "] does not equal the number expected." );
 
     }
 
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/logging/CacheEventLoggerDebugLoggerUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/logging/CacheEventLoggerDebugLoggerUnitTest.java
index 9c82984fd..13c18c60e 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/logging/CacheEventLoggerDebugLoggerUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/logging/CacheEventLoggerDebugLoggerUnitTest.java
@@ -19,21 +19,21 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.StringWriter;
 
 import org.apache.commons.jcs3.TestLogConfigurationUtil;
 import org.apache.commons.jcs3.engine.logging.behavior.ICacheEvent;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the debug implementation */
-public class CacheEventLoggerDebugLoggerUnitTest
+class CacheEventLoggerDebugLoggerUnitTest
 {
 
     /** Verify that we can log */
     @Test
-    public void testLogApplicationEvent_normal()
+    void testLogApplicationEvent_normal()
     {
         // SETUP
         final String logCategoryName = "testLogApplicationEvent_normal";
@@ -53,14 +53,16 @@ public void testLogApplicationEvent_normal()
 
         // VERIFY
         final String result = stringWriter.toString();
-        assertTrue( "An event with the source should have been logged:" + result, result.indexOf( source ) != -1 );
-        assertTrue( "An event with the event name should have been logged:" + result, result.indexOf( eventName ) != -1 );
-        assertTrue( "An event with the optionalDetails should have been logged:" + result, result.indexOf( optionalDetails ) != -1 );
+        assertTrue( result.indexOf( source ) != -1, "An event with the source should have been logged:" + result );
+        assertTrue( result.indexOf( eventName ) != -1,
+                    "An event with the event name should have been logged:" + result );
+        assertTrue( result.indexOf( optionalDetails ) != -1,
+                    "An event with the optionalDetails should have been logged:" + result );
     }
 
     /** Verify that we can log */
     @Test
-    public void testLogError_normal()
+    void testLogError_normal()
     {
         // SETUP
         final String logCategoryName = "testLogApplicationEvent_normal";
@@ -80,14 +82,16 @@ public void testLogError_normal()
 
         // VERIFY
         final String result = stringWriter.toString();
-        assertTrue( "An event with the source should have been logged:" + result, result.indexOf( source ) != -1 );
-        assertTrue( "An event with the event name should have been logged:" + result, result.indexOf( eventName ) != -1 );
-        assertTrue( "An event with the errorMessage should have been logged:" + result, result.indexOf( errorMessage ) != -1 );
+        assertTrue( result.indexOf( source ) != -1, "An event with the source should have been logged:" + result );
+        assertTrue( result.indexOf( eventName ) != -1,
+                    "An event with the event name should have been logged:" + result );
+        assertTrue( result.indexOf( errorMessage ) != -1,
+                    "An event with the errorMessage should have been logged:" + result );
     }
 
     /** Verify that we can log */
     @Test
-    public void testLogICacheEvent_normal()
+    void testLogICacheEvent_normal()
     {
         // SETUP
         final String logCategoryName = "testLogEvent_normal";
@@ -111,10 +115,12 @@ public void testLogICacheEvent_normal()
 
         // VERIFY
         final String result = stringWriter.toString();
-        assertTrue( "An event with the source should have been logged:" + result, result.indexOf( source ) != -1 );
-        assertTrue( "An event with the region should have been logged:" + result, result.indexOf( region ) != -1 );
-        assertTrue( "An event with the event name should have been logged:" + result, result.indexOf( eventName ) != -1 );
-        assertTrue( "An event with the optionalDetails should have been logged:" + result, result.indexOf( optionalDetails ) != -1 );
-        assertTrue( "An event with the key should have been logged:" + result, result.indexOf( key ) != -1 );
+        assertTrue( result.indexOf( source ) != -1, "An event with the source should have been logged:" + result );
+        assertTrue( result.indexOf( region ) != -1, "An event with the region should have been logged:" + result );
+        assertTrue( result.indexOf( eventName ) != -1,
+                    "An event with the event name should have been logged:" + result );
+        assertTrue( result.indexOf( optionalDetails ) != -1,
+                    "An event with the optionalDetails should have been logged:" + result );
+        assertTrue( result.indexOf( key ) != -1, "An event with the key should have been logged:" + result );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/match/KeyMatcherPatternImpllUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/match/KeyMatcherPatternImpllUnitTest.java
index 4197b3794..0afe7e10e 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/match/KeyMatcherPatternImpllUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/match/KeyMatcherPatternImpllUnitTest.java
@@ -19,21 +19,21 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the key matcher. */
-public class KeyMatcherPatternImpllUnitTest
+class KeyMatcherPatternImpllUnitTest
 {
     /**
      * Verify that the matching method works.
      */
     @Test
-    public void testGetMatchingKeysFromArray_AllMatch()
+    void testGetMatchingKeysFromArray_AllMatch()
     {
         // SETUP
         final int numToInsertPrefix1 = 10;
@@ -53,14 +53,14 @@ public void testGetMatchingKeysFromArray_AllMatch()
         final Set<String> result1 = keyMatcher.getMatchingKeysFromArray( keyprefix1 + ".", keyArray );
 
         // VERIFY
-        assertEquals( "Wrong number returned 1: " + result1, numToInsertPrefix1, result1.size() );
+        assertEquals( numToInsertPrefix1, result1.size(), "Wrong number returned 1: " + result1 );
     }
 
     /**
      * Verify that the matching method works.
      */
     @Test
-    public void testGetMatchingKeysFromArray_AllMatchFirstNull()
+    void testGetMatchingKeysFromArray_AllMatchFirstNull()
     {
         // SETUP
         final int numToInsertPrefix1 = 10;
@@ -80,14 +80,14 @@ public void testGetMatchingKeysFromArray_AllMatchFirstNull()
         final Set<String> result1 = keyMatcher.getMatchingKeysFromArray( keyprefix1 + "\\S+", keyArray );
 
         // VERIFY
-        assertEquals( "Wrong number returned 1: " + result1, numToInsertPrefix1, result1.size() );
+        assertEquals( numToInsertPrefix1, result1.size(), "Wrong number returned 1: " + result1 );
     }
 
     /**
      * Verify that the matching method works.
      */
     @Test
-    public void testGetMatchingKeysFromArray_TwoTypes()
+    void testGetMatchingKeysFromArray_TwoTypes()
     {
         // SETUP
         final int numToInsertPrefix1 = 10;
@@ -116,7 +116,7 @@ public void testGetMatchingKeysFromArray_TwoTypes()
         final Set<String> result2 = keyMatcher.getMatchingKeysFromArray( keyprefix2 + ".+", keyArray );
 
         // VERIFY
-        assertEquals( "Wrong number returned 1: " + result1, numToInsertPrefix1, result1.size() );
-        assertEquals( "Wrong number returned 2: " + result2, numToInsertPrefix2, result2.size() );
+        assertEquals( numToInsertPrefix1, result1.size(), "Wrong number returned 1: " + result1 );
+        assertEquals( numToInsertPrefix2, result2.size(), "Wrong number returned 2: " + result2 );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/fifo/FIFOMemoryCacheUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/fifo/FIFOMemoryCacheUnitTest.java
index f3178af4a..68df14787 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/fifo/FIFOMemoryCacheUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/fifo/FIFOMemoryCacheUnitTest.java
@@ -19,8 +19,8 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.IOException;
 
@@ -29,10 +29,10 @@
 import org.apache.commons.jcs3.engine.ElementAttributes;
 import org.apache.commons.jcs3.engine.behavior.ICompositeCacheAttributes;
 import org.apache.commons.jcs3.engine.control.CompositeCache;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the fifo implementation. */
-public class FIFOMemoryCacheUnitTest
+class FIFOMemoryCacheUnitTest
 {
     /**
      * Verify that the oldest inserted item is removed
@@ -40,7 +40,7 @@ public class FIFOMemoryCacheUnitTest
      * @throws IOException
      */
     @Test
-    public void testExpirationPolicy_doubleOver()
+    void testExpirationPolicy_doubleOver()
         throws IOException
     {
         // SETUP
@@ -63,10 +63,10 @@ public void testExpirationPolicy_doubleOver()
         }
 
         // VERIFY
-        assertEquals( "Should have max elements", maxObjects, cache.getSize() );
+        assertEquals( maxObjects, cache.getSize(), "Should have max elements" );
         for ( int i = maxObjects * 2 - 1; i > maxObjects; i-- )
         {
-            assertNotNull( "Should have elemnt " + i, cache.get( "key" + i ) );
+            assertNotNull( cache.get( "key" + i ), "Should have elemnt " + i );
         }
     }
 
@@ -76,7 +76,7 @@ public void testExpirationPolicy_doubleOver()
      * @throws IOException
      */
     @Test
-    public void testExpirationPolicy_oneExtra()
+    void testExpirationPolicy_oneExtra()
         throws IOException
     {
         // SETUP
@@ -103,12 +103,12 @@ public void testExpirationPolicy_oneExtra()
         cache.update( oneMoreElement );
 
         // VERIFY
-        assertEquals( "Should have max elements", maxObjects, cache.getSize() );
+        assertEquals( maxObjects, cache.getSize(), "Should have max elements" );
         System.out.println(cache.getKeySet());
         for ( int i = maxObjects - 1; i > 1; i-- )
         {
-            assertNotNull( "Should have element " + i, cache.get( "key" + i ) );
+            assertNotNull( cache.get( "key" + i ), "Should have element " + i );
         }
-        assertNotNull( "Should have oneMoreElement", cache.get( "onemore" ) );
+        assertNotNull( cache.get( "onemore" ), "Should have oneMoreElement" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCacheConcurrentUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCacheConcurrentUnitTest.java
index 7a560dd0a..d9df66192 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCacheConcurrentUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCacheConcurrentUnitTest.java
@@ -19,64 +19,36 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.extensions.ActiveTestSuite;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
 import org.apache.commons.jcs3.engine.CacheElement;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
 import org.apache.commons.jcs3.engine.control.CompositeCache;
 import org.apache.commons.jcs3.engine.control.CompositeCacheManager;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test which exercises the LRUMemory cache. This one uses three different
  * regions for three threads.
  */
-public class LHMLRUMemoryCacheConcurrentUnitTest
+class LHMLRUMemoryCacheConcurrentUnitTest
 {
-    /**
-     * Number of items to cache, twice the configured maxObjects for the memory
-     * cache regions.
-     */
+
+    // Number of items to cache, twice the configured maxObjects for the memory cache regions.
     private static final int items = 200;
 
     /**
      * Adds items to cache, gets them, and removes them. The item count is more
      * than the size of the memory cache, so items should be dumped.
-     * <p>
-     * @param region
-     *            Name of the region to access
-     *
-     * @throws Exception
-     *                If an error occurs
+     * @param region Name of the region to access
+     * @throws Exception If an error occurs
      */
     public static void runTestForRegion( final String region )
         throws Exception
@@ -89,10 +61,10 @@ public static void runTestForRegion( final String region )
         lru.initialize( cache );
 
         // Add items to cache
-
         for ( int i = 0; i < items; i++ )
         {
-            final ICacheElement<String, String> ice = new CacheElement<>( cache.getCacheName(), i + ":key", region + " data " + i );
+            final ICacheElement<String, String> ice = new CacheElement<>( cache.getCacheName(), i + ":key",
+                                                                          region + " data " + i );
             ice.setElementAttributes( cache.getElementAttributes() );
             lru.update( ice );
         }
@@ -100,7 +72,7 @@ public static void runTestForRegion( final String region )
         // Test that initial items have been purged
         for ( int i = 0; i < 100; i++ )
         {
-            assertNull( "Should not have " + i + ":key", lru.get( i + ":key" ) );
+            assertNull( lru.get( i + ":key" ), "Should not have " + i + ":key" );
         }
 
         // Test that last items are in cache
@@ -120,59 +92,45 @@ public static void runTestForRegion( final String region )
         final Map<String, ICacheElement<String, String>> elements = lru.getMultiple( keys );
         for ( int i = 0; i < 100; i++ )
         {
-            assertNull( "Should not have " + i + ":key", elements.get( i + ":key" ) );
+            assertNull( elements.get( i + ":key" ), "Should not have " + i + ":key" );
         }
         for ( int i = 100; i < items; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", region + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( region + " data " + i, element.getVal(), "value " + i + ":key" );
         }
 
         // Remove all the items
-
         for ( int i = 0; i < items; i++ )
         {
             lru.remove( i + ":key" );
         }
 
         // Verify removal
-
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key", lru.get( i + ":key" ) );
+            assertNull( lru.get( i + ":key" ), "Removed key should be null: " + i + ":key" );
         }
     }
 
     /**
-     * A unit test suite for JUnit
-     * <p>
-     * @return The test suite
+     * Test setup
      */
-    public static Test suite()
+    @BeforeEach
+    void setUp()
     {
-        final ActiveTestSuite suite = new ActiveTestSuite();
-
-        suite.addTest(new TestCase("testLHMLRUMemoryCache" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "indexedRegion1" );
-            }
-        });
-
-        return suite;
+        // Any setup logic can go here, e.g., configuring caches
+        // JCS.setConfigFilename("/TestLHMLRUCache.ccf");
     }
 
     /**
-     * Test setup
+     * Run test for region 'indexedRegion1'
      */
-    @Before
-    public void setUp()
+    @Test
+    void testLHMLRUMemoryCache()
+        throws Exception
     {
-        //JCS.setConfigFilename( "/TestLHMLRUCache.ccf" );
+        runTestForRegion( "indexedRegion1" );
     }
-
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCacheUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCacheUnitTest.java
index 7aa0b09ba..5bd63cbb5 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCacheUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCacheUnitTest.java
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -35,17 +35,17 @@
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
 import org.apache.commons.jcs3.engine.control.CompositeCache;
 import org.apache.commons.jcs3.engine.control.CompositeCacheManager;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the test LHMLRU implementation.
  */
-public class LHMLRUMemoryCacheUnitTest
+class LHMLRUMemoryCacheUnitTest
 {
     /** Test setup */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
     {
         JCS.setConfigFilename( "/TestLHMLRUCache.ccf" );
     }
@@ -56,7 +56,7 @@ public void setUp()
      * @throws CacheException
      */
     @Test
-    public void testClearThroughHub()
+    void testClearThroughHub()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testClearThroughHub" );
@@ -75,7 +75,7 @@ public void testClearThroughHub()
         for ( int i = max; i >= 0; i-- )
         {
             final String value = cache.get( i + ":key" );
-            assertNull( "Should not have value for key [" + i + ":key" + "] in the cache.", value );
+            assertNull( value, "Should not have value for key [" + i + ":key" + "] in the cache." );
         }
     }
 
@@ -86,7 +86,7 @@ public void testClearThroughHub()
      * @throws Exception
      */
     @Test
-    public void testGetKeyArray()
+    void testGetKeyArray()
         throws Exception
     {
         final CompositeCacheManager cacheMgr = CompositeCacheManager.getUnconfiguredInstance();
@@ -108,7 +108,7 @@ public void testGetKeyArray()
 
         final Set<String> keys = mru.getKeySet();
 
-        assertEquals( "Wrong number of keys.", items, keys.size() );
+        assertEquals( items, keys.size(), "Wrong number of keys." );
     }
 
     /**
@@ -117,7 +117,7 @@ public void testGetKeyArray()
      * @throws CacheException
      */
     @Test
-    public void testGetStatsThroughHub()
+    void testGetStatsThroughHub()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testGetStatsThroughHub" );
@@ -135,7 +135,7 @@ public void testGetStatsThroughHub()
         //System.out.println( stats );
 
         // TODO improve stats check
-        assertTrue( "Should have 200 puts" + stats, stats.indexOf( "200" ) != -1 );
+        assertTrue( stats.indexOf( "200" ) != -1, "Should have 200 puts" + stats );
     }
 
     /**
@@ -145,12 +145,12 @@ public void testGetStatsThroughHub()
      * @throws CacheException
      */
     @Test
-    public void testLoadFromCCF()
+    void testLoadFromCCF()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testLoadFromCCF" );
         final String memoryCacheName = cache.getCacheAttributes().getMemoryCacheName();
-        assertTrue( "Cache name should have LHMLRU in it.", memoryCacheName.indexOf( "LHMLRUMemoryCache" ) != -1 );
+        assertTrue( memoryCacheName.indexOf( "LHMLRUMemoryCache" ) != -1, "Cache name should have LHMLRU in it." );
     }
 
     /**
@@ -159,7 +159,7 @@ public void testLoadFromCCF()
      * @throws CacheException
      */
     @Test
-    public void testPutGetThroughHub()
+    void testPutGetThroughHub()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
@@ -176,7 +176,7 @@ public void testPutGetThroughHub()
         for ( int i = max -1; i >= 0; i-- )
         {
             final String value = cache.get( i + ":key" );
-            assertNull( "Should not have value for key [" + i + ":key" + "] in the cache." + cache.getStats(), value );
+            assertNull( value, "Should not have value for key [" + i + ":key" + "] in the cache." + cache.getStats() );
         }
 
         // Test that last items are in cache
@@ -197,13 +197,14 @@ public void testPutGetThroughHub()
         final Map<String, ICacheElement<String, String>> elements = cache.getCacheElements( keys );
         for ( int i = max-1; i >= 0; i-- )
         {
-            assertNull( "Should not have value for key [" + i + ":key" + "] in the cache." + cache.getStats(), elements.get( i + ":key" ) );
+            assertNull( elements.get( i + ":key" ),
+                        "Should not have value for key [" + i + ":key" + "] in the cache." + cache.getStats() );
         }
         for ( int i = max + 2; i < items; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", "myregion" + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( "myregion" + " data " + i, element.getVal(), "value " + i + ":key" );
         }
     }
 
@@ -213,7 +214,7 @@ public void testPutGetThroughHub()
      * @throws CacheException
      */
     @Test
-    public void testPutGetThroughHubTwice()
+    void testPutGetThroughHubTwice()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHubTwice" );
@@ -235,7 +236,7 @@ public void testPutGetThroughHubTwice()
         for ( int i = max -1; i >= 0; i-- )
         {
             final String value = cache.get( i + ":key" );
-            assertNull( "Should not have value for key [" + i + ":key" + "] in the cache.", value );
+            assertNull( value, "Should not have value for key [" + i + ":key" + "] in the cache." );
         }
 
         // Test that last items are in cache
@@ -254,7 +255,7 @@ public void testPutGetThroughHubTwice()
      * @throws CacheException
      */
     @Test
-    public void testPutRemoveThroughHub()
+    void testPutRemoveThroughHub()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testPutRemoveThroughHub" );
@@ -276,7 +277,7 @@ public void testPutRemoveThroughHub()
         for ( int i = max; i >= 0; i-- )
         {
             final String value = cache.get( i + ":key" );
-            assertNull( "Should not have value for key [" + i + ":key" + "] in the cache.", value );
+            assertNull( value, "Should not have value for key [" + i + ":key" + "] in the cache." );
         }
     }
 
@@ -286,7 +287,7 @@ public void testPutRemoveThroughHub()
      * @throws CacheException
      */
     @Test
-    public void testRemovePartialThroughHub()
+    void testRemovePartialThroughHub()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testRemovePartialThroughHub" );
@@ -315,9 +316,9 @@ public void testRemovePartialThroughHub()
 
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Should have been removed by partial loop.", cache.get( root + ":" + i + ":key" ) );
+            assertNull( cache.get( root + ":" + i + ":key" ), "Should have been removed by partial loop." );
         }
 
-        assertNotNull( "Other item should be in the cache.", cache.get( "test" ) );
+        assertNotNull( cache.get( "test" ), "Other item should be in the cache." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/lru/LRUMemoryCacheConcurrentUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/lru/LRUMemoryCacheConcurrentUnitTest.java
index 0847bb1e9..81521c505 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/lru/LRUMemoryCacheConcurrentUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/lru/LRUMemoryCacheConcurrentUnitTest.java
@@ -19,44 +19,36 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import junit.extensions.ActiveTestSuite;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
 import org.apache.commons.jcs3.engine.CacheElement;
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
 import org.apache.commons.jcs3.engine.control.CompositeCache;
 import org.apache.commons.jcs3.engine.control.CompositeCacheManager;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test which exercises the LRUMemory cache. This one uses three different
  * regions for three threads.
  */
-public class LRUMemoryCacheConcurrentUnitTest
+class LRUMemoryCacheConcurrentUnitTest
 {
-    /**
-     * Number of items to cache, twice the configured maxObjects for the memory
-     * cache regions.
-     */
+
+    // Number of items to cache, twice the configured maxObjects for the memory cache regions.
     private static final int items = 200;
 
     /**
      * Adds items to cache, gets them, and removes them. The item count is more
      * than the size of the memory cache, so items should be dumped.
-     * <p>
-     * @param region
-     *            Name of the region to access
-     * @throws Exception
-     *                If an error occurs
+     * @param region Name of the region to access
+     * @throws Exception If an error occurs
      */
     public static void runTestForRegion( final String region )
         throws Exception
@@ -69,10 +61,10 @@ public static void runTestForRegion( final String region )
         lru.initialize( cache );
 
         // Add items to cache
-
         for ( int i = 0; i < items; i++ )
         {
-            final ICacheElement<String, String> ice = new CacheElement<>( cache.getCacheName(), i + ":key", region + " data " + i );
+            final ICacheElement<String, String> ice = new CacheElement<>( cache.getCacheName(), i + ":key",
+                                                                          region + " data " + i );
             ice.setElementAttributes( cache.getElementAttributes() );
             lru.update( ice );
         }
@@ -80,7 +72,7 @@ public static void runTestForRegion( final String region )
         // Test that initial items have been purged
         for ( int i = 0; i < 100; i++ )
         {
-            assertNull( "Should not have " + i + ":key", lru.get( i + ":key" ) );
+            assertNull( lru.get( i + ":key" ), "Should not have " + i + ":key" );
         }
 
         // Test that last items are in cache
@@ -100,13 +92,13 @@ public static void runTestForRegion( final String region )
         final Map<String, ICacheElement<String, String>> elements = lru.getMultiple( keys );
         for ( int i = 0; i < 100; i++ )
         {
-            assertNull( "Should not have " + i + ":key", elements.get( i + ":key" ) );
+            assertNull( elements.get( i + ":key" ), "Should not have " + i + ":key" );
         }
         for ( int i = 100; i < items; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", region + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( region + " data " + i, element.getVal(), "value " + i + ":key" );
         }
 
         // Remove all the items
@@ -118,38 +110,27 @@ public static void runTestForRegion( final String region )
         // Verify removal
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Removed key should be null: " + i + ":key", lru.get( i + ":key" ) );
+            assertNull( lru.get( i + ":key" ), "Removed key should be null: " + i + ":key" );
         }
     }
 
     /**
-     * A unit test suite for JUnit
-     * <p>
-     * @return The test suite
+     * Test setup
      */
-    public static Test suite()
+    @BeforeEach
+    void setUp()
     {
-        final ActiveTestSuite suite = new ActiveTestSuite();
-
-        suite.addTest(new TestCase("testLRUMemoryCache" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runTestForRegion( "testRegion1" );
-            }
-        });
-
-        return suite;
+        // Any setup logic can go here, e.g., configuring caches
+        // JCS.setConfigFilename("/TestDiskCache.ccf");
     }
 
     /**
-     * Test setup
+     * Run test for region 'testRegion1'
      */
-    @Before
-    public void setUp()
+    @Test
+    void testLRUMemoryCache()
+        throws Exception
     {
-        //JCS.setConfigFilename( "/TestDiskCache.ccf" );
+        runTestForRegion( "testRegion1" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/mru/LRUvsMRUPerformanceTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/mru/LRUvsMRUPerformanceTest.java
index 897a77219..7a107db72 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/mru/LRUvsMRUPerformanceTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/mru/LRUvsMRUPerformanceTest.java
@@ -24,7 +24,7 @@
 import org.apache.commons.jcs3.engine.memory.lru.LRUMemoryCache;
 import org.apache.commons.jcs3.log.Log;
 import org.apache.commons.jcs3.log.LogManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the performance difference between the LRU and the MRU. There should be very little.
@@ -158,7 +158,7 @@ public void doWork()
      * @throws Exception Description of the Exception
      */
     @Test
-    public void testSimpleLoad()
+    void testSimpleLoad()
         throws Exception
     {
         final Log log1 = LogManager.getLog( LRUMemoryCache.class );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/mru/MRUMemoryCacheUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/mru/MRUMemoryCacheUnitTest.java
index 19e811723..a8d4c7126 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/mru/MRUMemoryCacheUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/mru/MRUMemoryCacheUnitTest.java
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -35,17 +35,17 @@
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
 import org.apache.commons.jcs3.engine.control.CompositeCache;
 import org.apache.commons.jcs3.engine.control.CompositeCacheManager;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the test MRU implementation.
  */
-public class MRUMemoryCacheUnitTest
+class MRUMemoryCacheUnitTest
 {
     /** Test setup */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
     {
         JCS.setConfigFilename( "/TestMRUCache.ccf" );
     }
@@ -56,7 +56,7 @@ public void setUp()
      * @throws CacheException
      */
     @Test
-    public void testClearThroughHub()
+    void testClearThroughHub()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
@@ -75,7 +75,7 @@ public void testClearThroughHub()
         for ( int i = max; i >= 0; i-- )
         {
             final String value = cache.get( i + ":key" );
-            assertNull( "Should not have value for key [" + i + ":key" + "] in the cache.", value );
+            assertNull( value, "Should not have value for key [" + i + ":key" + "] in the cache." );
         }
     }
 
@@ -86,7 +86,7 @@ public void testClearThroughHub()
      * @throws Exception
      */
     @Test
-    public void testGetKeyArray()
+    void testGetKeyArray()
         throws Exception
     {
         final CompositeCacheManager cacheMgr = CompositeCacheManager.getUnconfiguredInstance();
@@ -108,7 +108,7 @@ public void testGetKeyArray()
 
         final Set<String> keys = mru.getKeySet();
 
-        assertEquals( "Wrong number of keys.", items, keys.size() );
+        assertEquals( items, keys.size(), "Wrong number of keys." );
     }
 
     /**
@@ -117,7 +117,7 @@ public void testGetKeyArray()
      * @throws CacheException
      */
     @Test
-    public void testGetStatsThroughHub()
+    void testGetStatsThroughHub()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testGetStatsThroughHub" );
@@ -135,7 +135,7 @@ public void testGetStatsThroughHub()
 //        System.out.println( stats );
 
         // TODO improve stats check
-        assertTrue( "Should have 200 puts", stats.indexOf( "2000" ) != -1 );
+        assertTrue( stats.indexOf( "2000" ) != -1, "Should have 200 puts" );
     }
 
     /**
@@ -145,12 +145,12 @@ public void testGetStatsThroughHub()
      * @throws CacheException
      */
     @Test
-    public void testLoadFromCCF()
+    void testLoadFromCCF()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testPutGet" );
         final String memoryCacheName = cache.getCacheAttributes().getMemoryCacheName();
-        assertTrue( "Cache name should have MRU in it.", memoryCacheName.indexOf( "MRUMemoryCache" ) != -1 );
+        assertTrue( memoryCacheName.indexOf( "MRUMemoryCache" ) != -1, "Cache name should have MRU in it." );
     }
 
     /**
@@ -159,7 +159,7 @@ public void testLoadFromCCF()
      * @throws CacheException
      */
     @Test
-    public void testPutGetThroughHub()
+    void testPutGetThroughHub()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
@@ -176,7 +176,7 @@ public void testPutGetThroughHub()
         for ( int i = max -1; i >= 0; i-- )
         {
             final String value = cache.get( i + ":key" );
-            assertNull( "Should not have value for key [" + i + ":key" + "] in the cache." + cache.getStats(), value );
+            assertNull( value, "Should not have value for key [" + i + ":key" + "] in the cache." + cache.getStats() );
         }
 
         // Test that last items are in cache
@@ -197,13 +197,14 @@ public void testPutGetThroughHub()
         final Map<String, ICacheElement<String, String>> elements = cache.getCacheElements( keys );
         for ( int i = max-1; i >= 0; i-- )
         {
-            assertNull( "Should not have value for key [" + i + ":key" + "] in the cache." + cache.getStats(), elements.get( i + ":key" ) );
+            assertNull( elements.get( i + ":key" ),
+                        "Should not have value for key [" + i + ":key" + "] in the cache." + cache.getStats() );
         }
         for ( int i = max + 2; i < items; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", "myregion" + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( "myregion" + " data " + i, element.getVal(), "value " + i + ":key" );
         }
     }
 
@@ -213,7 +214,7 @@ public void testPutGetThroughHub()
      * @throws CacheException
      */
     @Test
-    public void testPutGetThroughHubTwice()
+    void testPutGetThroughHubTwice()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
@@ -235,7 +236,7 @@ public void testPutGetThroughHubTwice()
         for ( int i = max-1; i >= 0; i-- )
         {
             final String value = cache.get( i + ":key" );
-            assertNull( "Should not have value for key [" + i + ":key" + "] in the cache.", value );
+            assertNull( value, "Should not have value for key [" + i + ":key" + "] in the cache." );
         }
 
         // Test that last items are in cache
@@ -254,7 +255,7 @@ public void testPutGetThroughHubTwice()
      * @throws CacheException
      */
     @Test
-    public void testPutRemoveThroughHub()
+    void testPutRemoveThroughHub()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
@@ -276,7 +277,7 @@ public void testPutRemoveThroughHub()
         for ( int i = max; i >= 0; i-- )
         {
             final String value = cache.get( i + ":key" );
-            assertNull( "Should not have value for key [" + i + ":key" + "] in the cache.", value );
+            assertNull( value, "Should not have value for key [" + i + ":key" + "] in the cache." );
         }
     }
 
@@ -286,7 +287,7 @@ public void testPutRemoveThroughHub()
      * @throws CacheException
      */
     @Test
-    public void testRemovePartialThroughHub()
+    void testRemovePartialThroughHub()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testGetStatsThroughHub" );
@@ -315,9 +316,9 @@ public void testRemovePartialThroughHub()
 
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Should have been removed by partial loop.", cache.get( root + ":" + i + ":key" ) );
+            assertNull( cache.get( root + ":" + i + ":key" ), "Should have been removed by partial loop." );
         }
 
-        assertNotNull( "Other item should be in the cache.", cache.get( "test" ) );
+        assertNotNull( cache.get( "test" ), "Other item should be in the cache." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/shrinking/ShrinkerThreadUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/shrinking/ShrinkerThreadUnitTest.java
index 66546b96a..eb0058ddd 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/shrinking/ShrinkerThreadUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/shrinking/ShrinkerThreadUnitTest.java
@@ -19,11 +19,11 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 
@@ -36,18 +36,19 @@
 import org.apache.commons.jcs3.engine.control.event.ElementEventHandlerMockImpl;
 import org.apache.commons.jcs3.engine.control.event.behavior.ElementEventType;
 import org.apache.commons.jcs3.engine.memory.MockMemoryCache;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * This tests the functionality of the shrinker thread.
  */
-public class ShrinkerThreadUnitTest
+class ShrinkerThreadUnitTest
 {
     /** Verify the check for removal
      * <p>
      * @throws IOException */
     @Test
-    public void testCheckForRemoval_Expired() throws IOException
+    void testCheckForRemoval_Expired()
+        throws IOException
     {
         // SETUP
         final CompositeCacheAttributes cacheAttr = new CompositeCacheAttributes();
@@ -76,14 +77,15 @@ public void testCheckForRemoval_Expired() throws IOException
                 ElementEventType.EXCEEDED_IDLETIME_BACKGROUND );
 
         // VERIFY
-        assertTrue( "Item should have expired.", result );
+        assertTrue( result, "Item should have expired." );
     }
 
     /** Verify the check for removal
      * <p>
      * @throws IOException */
     @Test
-    public void testCheckForRemoval_IdleTooLong() throws IOException
+    void testCheckForRemoval_IdleTooLong()
+        throws IOException
     {
         // SETUP
         final CompositeCacheAttributes cacheAttr = new CompositeCacheAttributes();
@@ -113,14 +115,15 @@ public void testCheckForRemoval_IdleTooLong() throws IOException
                 ElementEventType.EXCEEDED_IDLETIME_BACKGROUND );
 
         // VERIFY
-        assertTrue( "Item should have expired.", result );
+        assertTrue( result, "Item should have expired." );
     }
 
     /** Verify the check for removal
      * <p>
      * @throws IOException */
     @Test
-    public void testCheckForRemoval_NotExpired() throws IOException
+    void testCheckForRemoval_NotExpired()
+        throws IOException
     {
         // SETUP
         final CompositeCacheAttributes cacheAttr = new CompositeCacheAttributes();
@@ -149,14 +152,15 @@ public void testCheckForRemoval_NotExpired() throws IOException
                 ElementEventType.EXCEEDED_IDLETIME_BACKGROUND );
 
         // VERIFY
-        assertFalse( "Item should not have expired.", result );
+        assertFalse( result, "Item should not have expired." );
     }
 
     /** Verify the check for removal
      * <p>
      * @throws IOException */
     @Test
-    public void testCheckForRemoval_NotIdleTooLong() throws IOException
+    void testCheckForRemoval_NotIdleTooLong()
+        throws IOException
     {
         // SETUP
         final CompositeCacheAttributes cacheAttr = new CompositeCacheAttributes();
@@ -186,7 +190,7 @@ public void testCheckForRemoval_NotIdleTooLong() throws IOException
                 ElementEventType.EXCEEDED_IDLETIME_BACKGROUND );
 
         // VERIFY
-        assertFalse( "Item should not have expired.", result );
+        assertFalse( result, "Item should not have expired." );
     }
 
     /**
@@ -196,7 +200,7 @@ public void testCheckForRemoval_NotIdleTooLong() throws IOException
      * @throws Exception
      */
     @Test
-    public void testSimpleShrink()
+    void testSimpleShrink()
         throws Exception
     {
         // SETUP
@@ -221,7 +225,7 @@ public void testSimpleShrink()
         memory.update( element );
 
         final ICacheElement<String, String> returnedElement1 = memory.get( key );
-        assertNotNull( "We should have received an element", returnedElement1 );
+        assertNotNull( returnedElement1, "We should have received an element" );
 
         // set this to 2 seconds ago.
         ElementAttributesUtils.setLastAccessTime( elementAttr,  System.currentTimeMillis() - 2000 );
@@ -234,8 +238,8 @@ public void testSimpleShrink()
 
         // VERIFY
         final ICacheElement<String, String> returnedElement2 = memory.get( key );
-        assertTrue( "Waterfall should have been called.", memory.waterfallCallCount > 0 );
-        assertNull( "We not should have received an element.  It should have been spooled.", returnedElement2 );
+        assertTrue( memory.waterfallCallCount > 0, "Waterfall should have been called." );
+        assertNull( returnedElement2, "We not should have received an element.  It should have been spooled." );
     }
 
     /**
@@ -244,7 +248,7 @@ public void testSimpleShrink()
      * @throws Exception
      */
     @Test
-    public void testSimpleShrinkMultiple()
+    void testSimpleShrinkMultiple()
         throws Exception
     {
         // SETUP
@@ -271,7 +275,7 @@ public void testSimpleShrinkMultiple()
             memory.update( element );
 
             final ICacheElement<String, String> returnedElement1 = memory.get( key );
-            assertNotNull( "We should have received an element", returnedElement1 );
+            assertNotNull( returnedElement1, "We should have received an element" );
 
             // set this to 2 seconds ago.
             ElementAttributesUtils.setLastAccessTime( elementAttr,  System.currentTimeMillis() - 2000 );
@@ -283,8 +287,8 @@ public void testSimpleShrinkMultiple()
 
         // VERIFY
         Thread.sleep( 500 );
-        assertEquals( "Waterfall called the wrong number of times.", 3, memory.waterfallCallCount );
-        assertEquals( "Wrong number of elements remain.", 7, memory.getSize() );
+        assertEquals( 3, memory.waterfallCallCount, "Waterfall called the wrong number of times." );
+        assertEquals( 7, memory.getSize(), "Wrong number of elements remain." );
     }
 
     /**
@@ -295,7 +299,7 @@ public void testSimpleShrinkMultiple()
      * @throws Exception
      */
     @Test
-    public void testSimpleShrinkMultipleWithEventHandler()
+    void testSimpleShrinkMultipleWithEventHandler()
         throws Exception
     {
         // SETUP
@@ -325,7 +329,7 @@ public void testSimpleShrinkMultipleWithEventHandler()
             memory.update( element );
 
             final ICacheElement<String, String> returnedElement1 = memory.get( key );
-            assertNotNull( "We should have received an element", returnedElement1 );
+            assertNotNull( returnedElement1, "We should have received an element" );
 
             // set this to 2 seconds ago.
             ElementAttributesUtils.setLastAccessTime( elementAttr,  System.currentTimeMillis() - 2000 );
@@ -337,10 +341,10 @@ public void testSimpleShrinkMultipleWithEventHandler()
 
         // VERIFY
         Thread.sleep( 500 );
-        assertEquals( "Waterfall called the wrong number of times.", 3, memory.waterfallCallCount );
+        assertEquals( 3, memory.waterfallCallCount, "Waterfall called the wrong number of times." );
         // the shrinker delegates the composite cache on the memory cache to put the
         // event on the queue.  This make it hard to test.  TODO we need to change this to make it easier to verify.
         //assertEquals( "Event handler ExceededIdleTimeBackground called the wrong number of times.", 3, handler.getExceededIdleTimeBackgroundCount() );
-        assertEquals( "Wrong number of elements remain.", 7, memory.getSize() );
+        assertEquals( 7, memory.getSize(), "Wrong number of elements remain." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/soft/SoftReferenceMemoryCacheUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/soft/SoftReferenceMemoryCacheUnitTest.java
index 05bb3cd9e..581e4f355 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/soft/SoftReferenceMemoryCacheUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/soft/SoftReferenceMemoryCacheUnitTest.java
@@ -1,10 +1,5 @@
 package org.apache.commons.jcs3.engine.memory.soft;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -24,6 +19,11 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -35,18 +35,18 @@
 import org.apache.commons.jcs3.engine.behavior.ICacheElement;
 import org.apache.commons.jcs3.engine.control.CompositeCache;
 import org.apache.commons.jcs3.engine.control.CompositeCacheManager;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the test Soft reference implementation.
  */
-public class SoftReferenceMemoryCacheUnitTest
+class SoftReferenceMemoryCacheUnitTest
 {
     /** Test setup */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
     {
         JCS.setConfigFilename( "/TestSoftReferenceCache.ccf" );
     }
@@ -54,8 +54,9 @@ public void setUp()
     /**
      * @see junit.framework.TestCase#tearDown()
      */
-    @After
-    public void tearDown() throws Exception
+    @AfterEach
+    void tearDown()
+        throws Exception
     {
         JCS.shutdown();
     }
@@ -66,7 +67,7 @@ public void tearDown() throws Exception
      * @throws CacheException
      */
     @Test
-    public void testClearThroughHub()
+    void testClearThroughHub()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
@@ -85,7 +86,7 @@ public void testClearThroughHub()
         for ( int i = max; i >= 0; i-- )
         {
             final String value = cache.get( i + ":key" );
-            assertNull( "Should not have value for key [" + i + ":key" + "] in the cache.", value );
+            assertNull( value, "Should not have value for key [" + i + ":key" + "] in the cache." );
         }
     }
 
@@ -96,7 +97,7 @@ public void testClearThroughHub()
      * @throws Exception
      */
     @Test
-    public void testGetKeyArray()
+    void testGetKeyArray()
         throws Exception
     {
         final CompositeCacheManager cacheMgr = CompositeCacheManager.getUnconfiguredInstance();
@@ -118,7 +119,7 @@ public void testGetKeyArray()
 
         final Set<String> keys = srmc.getKeySet();
 
-        assertEquals( "Wrong number of keys.", items, keys.size() );
+        assertEquals( items, keys.size(), "Wrong number of keys." );
     }
 
     /**
@@ -128,13 +129,13 @@ public void testGetKeyArray()
      * @throws CacheException
      */
     @Test
-    public void testLoadFromCCF()
+    void testLoadFromCCF()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testPutGet" );
         final String memoryCacheName = cache.getCacheAttributes().getMemoryCacheName();
-        assertTrue( "Cache name should have SoftReference in it.",
-                memoryCacheName.indexOf( "SoftReferenceMemoryCache" ) != -1 );
+        assertTrue( memoryCacheName.indexOf( "SoftReferenceMemoryCache" ) != -1,
+                    "Cache name should have SoftReference in it." );
     }
 
     /**
@@ -143,7 +144,7 @@ public void testLoadFromCCF()
      * @throws CacheException
      */
     @Test
-    public void testPutGetThroughHub()
+    void testPutGetThroughHub()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
@@ -174,8 +175,8 @@ public void testPutGetThroughHub()
         for ( int i = 0; i < items; i++ )
         {
             final ICacheElement<String, String> element = elements.get( i + ":key" );
-            assertNotNull( "element " + i + ":key is missing", element );
-            assertEquals( "value " + i + ":key", "myregion" + " data " + i, element.getVal() );
+            assertNotNull( element, "element " + i + ":key is missing" );
+            assertEquals( "myregion" + " data " + i, element.getVal(), "value " + i + ":key" );
         }
 
         // System.out.println(cache.getStats());
@@ -187,7 +188,7 @@ public void testPutGetThroughHub()
      * @throws CacheException
      */
     @Test
-    public void testPutRemoveThroughHub()
+    void testPutRemoveThroughHub()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
@@ -209,7 +210,7 @@ public void testPutRemoveThroughHub()
         for ( int i = max; i >= 0; i-- )
         {
             final String value = cache.get( i + ":key" );
-            assertNull( "Should not have value for key [" + i + ":key" + "] in the cache.", value );
+            assertNull( value, "Should not have value for key [" + i + ":key" + "] in the cache." );
         }
     }
 
@@ -219,7 +220,7 @@ public void testPutRemoveThroughHub()
      * @throws CacheException
      */
     @Test
-    public void testRemovePartialThroughHub()
+    void testRemovePartialThroughHub()
         throws CacheException
     {
         final CacheAccess<String, String> cache = JCS.getInstance( "testGetStatsThroughHub" );
@@ -248,9 +249,9 @@ public void testRemovePartialThroughHub()
 
         for ( int i = 0; i < items; i++ )
         {
-            assertNull( "Should have been removed by partial loop.", cache.get( root + ":" + i + ":key" ) );
+            assertNull( cache.get( root + ":" + i + ":key" ), "Should have been removed by partial loop." );
         }
 
-        assertNotNull( "Other item should be in the cache.", cache.get( "test" ) );
+        assertNotNull( cache.get( "test" ), "Other item should be in the cache." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerNoLogSystemUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerNoLogSystemUnitTest.java
index 422a26952..9fc10ee82 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerNoLogSystemUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerNoLogSystemUnitTest.java
@@ -19,16 +19,20 @@
  * under the License.
  */
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class LogManagerNoLogSystemUnitTest
+import org.junit.jupiter.api.Test;
+
+class LogManagerNoLogSystemUnitTest
 {
-    @Test(expected = ExceptionInInitializerError.class)
-    public void testLogFactoryNonExistingLogSystem()
+    @Test
+    void testLogFactoryNonExistingLogSystem()
     {
-        // Set non-existing log system
-        LogManager.setLogSystem("test-logging");
+        assertThrows( ExceptionInInitializerError.class, () -> {
+            // Set non-existing log system
+            LogManager.setLogSystem( "test-logging" );
 
-        LogManager.getLog(getClass());
+            LogManager.getLog( getClass() );
+        } );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerUnitTest.java
index a45af5098..cf62d69a8 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerUnitTest.java
@@ -19,14 +19,14 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class LogManagerUnitTest
+class LogManagerUnitTest
 {
     @Test
-    public void testLogFactoryDefault()
+    void testLogFactoryDefault()
     {
         // Set default log system
         LogManager.setLogSystem(LogManager.LOGSYSTEM_JAVA_UTIL_LOGGING);
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/access/JCSWorkerUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/access/JCSWorkerUnitTest.java
index 7061de13d..85b7f0e95 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/access/JCSWorkerUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/access/JCSWorkerUnitTest.java
@@ -19,14 +19,14 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test cases for the JCS worker.
  */
-public class JCSWorkerUnitTest
+class JCSWorkerUnitTest
 {
 
     /**
@@ -37,7 +37,7 @@ public class JCSWorkerUnitTest
      * @throws Exception
      */
     @Test
-    public void testSimpleGet()
+    void testSimpleGet()
         throws Exception
     {
         final JCSWorker<String, Long> cachingWorker = new JCSWorker<>( "example region" );
@@ -57,11 +57,11 @@ public Long doWork()
         final String key = "abc";
 
         final Long result = cachingWorker.getResult( key, helper );
-        assertEquals( "Called the wrong number of times", Long.valueOf( 1 ), result );
+        assertEquals( Long.valueOf( 1 ), result, "Called the wrong number of times" );
 
         // should get it from the cache.
         final Long result2 = cachingWorker.getResult( key, helper );
-        assertEquals( "Called the wrong number of times", Long.valueOf( 1 ), result2 );
+        assertEquals( Long.valueOf( 1 ), result2, "Called the wrong number of times" );
     }
 
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/config/PropertySetterUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/config/PropertySetterUnitTest.java
index a6f4a3d97..e24dd6cb3 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/config/PropertySetterUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/config/PropertySetterUnitTest.java
@@ -18,41 +18,42 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 
 import java.io.File;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test property settings
  */
-public class PropertySetterUnitTest
+class PropertySetterUnitTest
 {
     enum EnumTest { ONE, TWO, THREE }
 
     @Test
-    public void testConvertArg()
+    void testConvertArg()
     {
         final PropertySetter ps = new PropertySetter(this);
         final Object s = ps.convertArg("test", String.class);
-        assertEquals("Should be a string", "test", s);
+        assertEquals( "test", s, "Should be a string" );
 
         final Object i = ps.convertArg("1", Integer.TYPE);
-        assertEquals("Should be an integer", Integer.valueOf(1), i);
+        assertEquals( Integer.valueOf( 1 ), i, "Should be an integer" );
 
         final Object l = ps.convertArg("1", Long.TYPE);
-        assertEquals("Should be a long", Long.valueOf(1), l);
+        assertEquals( Long.valueOf( 1 ), l, "Should be a long" );
 
         final Object b = ps.convertArg("true", Boolean.TYPE);
-        assertEquals("Should be a boolean", Boolean.TRUE, b);
+        assertEquals( Boolean.TRUE, b, "Should be a boolean" );
 
         final Object e = ps.convertArg("TWO", EnumTest.class);
-        assertEquals("Should be an enum", EnumTest.TWO, e);
+        assertEquals( EnumTest.TWO, e, "Should be an enum" );
 
         final Object f = ps.convertArg("test.conf", File.class);
-        assertTrue("Should be a file", f instanceof File);
+        assertInstanceOf( File.class, f, "Should be a file" );
     }
 
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoverySenderEncryptedUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoverySenderEncryptedUnitTest.java
index 7eca1bb7e..47162c924 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoverySenderEncryptedUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoverySenderEncryptedUnitTest.java
@@ -19,9 +19,9 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assume.assumeNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.ArrayList;
 import java.util.concurrent.CompletableFuture;
@@ -30,14 +30,14 @@
 import org.apache.commons.jcs3.utils.discovery.UDPDiscoveryMessage.BroadcastType;
 import org.apache.commons.jcs3.utils.net.HostNameUtil;
 import org.apache.commons.jcs3.utils.serialization.EncryptingSerializer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the sender with EncryptingSerializer.
  */
-public class UDPDiscoverySenderEncryptedUnitTest
+class UDPDiscoverySenderEncryptedUnitTest
 {
     /** Multicast address to send/receive on */
     private static final String ADDRESS = "228.4.5.9";
@@ -66,19 +66,18 @@ public class UDPDiscoverySenderEncryptedUnitTest
      * <p>
      * @throws Exception on error
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
         throws Exception
     {
-        assumeNotNull("This machine does not support multicast", HostNameUtil.getMulticastNetworkInterface());
+        assumeTrue( HostNameUtil.getMulticastNetworkInterface() != null, "This machine does not support multicast" );
 
         final EncryptingSerializer serializer = new EncryptingSerializer();
         serializer.setPreSharedKey("my_key");
 
         futureMsg = new CompletableFuture<>();
-        receiver = new UDPDiscoveryReceiver( msg -> {
-            futureMsg.complete(msg);
-        }, null, ADDRESS, PORT );
+        receiver = new UDPDiscoveryReceiver( msg ->
+                                                 futureMsg.complete( msg ), null, ADDRESS, PORT );
         receiver.setSerializer(serializer);
         final Thread t = new Thread( receiver );
         t.start();
@@ -91,8 +90,8 @@ public void setUp()
      * <p>
      * @throws Exception on error
      */
-    @After
-    public void tearDown()
+    @AfterEach
+    void tearDown()
         throws Exception
     {
         if (receiver != null)
@@ -111,7 +110,7 @@ public void tearDown()
      * @throws Exception on error
      */
     @Test
-    public void testPassiveBroadcast()
+    void testPassiveBroadcast()
         throws Exception
     {
         // SETUP
@@ -123,9 +122,9 @@ public void testPassiveBroadcast()
 
         // VERIFY
         final UDPDiscoveryMessage msg = futureMsg.get(3, TimeUnit.SECONDS);
-        assertNotNull("message not received", msg);
-        assertEquals( "wrong port", SENDING_PORT, msg.getPort() );
-        assertEquals( "wrong message type", BroadcastType.PASSIVE, msg.getMessageType() );
+        assertNotNull( msg, "message not received" );
+        assertEquals( SENDING_PORT, msg.getPort(), "wrong port" );
+        assertEquals( BroadcastType.PASSIVE, msg.getMessageType(), "wrong message type" );
     }
 
     /**
@@ -134,7 +133,7 @@ public void testPassiveBroadcast()
      * @throws Exception on error
      */
     @Test
-    public void testRemoveBroadcast()
+    void testRemoveBroadcast()
         throws Exception
     {
         // SETUP
@@ -146,9 +145,9 @@ public void testRemoveBroadcast()
 
         // VERIFY
         final UDPDiscoveryMessage msg = futureMsg.get(3, TimeUnit.SECONDS);
-        assertNotNull("message not received", msg);
-        assertEquals( "wrong port", SENDING_PORT, msg.getPort() );
-        assertEquals( "wrong message type", BroadcastType.REMOVE, msg.getMessageType() );
+        assertNotNull( msg, "message not received" );
+        assertEquals( SENDING_PORT, msg.getPort(), "wrong port" );
+        assertEquals( BroadcastType.REMOVE, msg.getMessageType(), "wrong message type" );
     }
 
     /**
@@ -157,7 +156,7 @@ public void testRemoveBroadcast()
      * @throws Exception on error
      */
     @Test
-    public void testRequestBroadcast()
+    void testRequestBroadcast()
         throws Exception
     {
         // DO WORK
@@ -165,7 +164,7 @@ public void testRequestBroadcast()
 
         // VERIFY
         final UDPDiscoveryMessage msg = futureMsg.get(3, TimeUnit.SECONDS);
-        assertNotNull("message not received", msg);
-        assertEquals( "wrong message type", BroadcastType.REQUEST, msg.getMessageType() );
+        assertNotNull( msg, "message not received" );
+        assertEquals( BroadcastType.REQUEST, msg.getMessageType(), "wrong message type" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoverySenderUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoverySenderUnitTest.java
index 9c1816e76..6656c578a 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoverySenderUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoverySenderUnitTest.java
@@ -19,9 +19,9 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assume.assumeNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.ArrayList;
 import java.util.concurrent.CompletableFuture;
@@ -30,14 +30,14 @@
 import org.apache.commons.jcs3.utils.discovery.UDPDiscoveryMessage.BroadcastType;
 import org.apache.commons.jcs3.utils.net.HostNameUtil;
 import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the sender.
  */
-public class UDPDiscoverySenderUnitTest
+class UDPDiscoverySenderUnitTest
 {
     /** Multicast address to send/receive on */
     private static final String ADDRESS = "228.4.5.9";
@@ -66,16 +66,15 @@ public class UDPDiscoverySenderUnitTest
      * <p>
      * @throws Exception on error
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
         throws Exception
     {
-        assumeNotNull("This machine does not support multicast", HostNameUtil.getMulticastNetworkInterface());
+        assumeTrue( HostNameUtil.getMulticastNetworkInterface() != null, "This machine does not support multicast" );
 
         futureMsg = new CompletableFuture<>();
-        receiver = new UDPDiscoveryReceiver( msg -> {
-            futureMsg.complete(msg);
-        }, null, ADDRESS, PORT );
+        receiver = new UDPDiscoveryReceiver( msg ->
+                                                 futureMsg.complete( msg ), null, ADDRESS, PORT );
         receiver.setSerializer(new StandardSerializer());
         final Thread t = new Thread( receiver );
         t.start();
@@ -88,8 +87,8 @@ public void setUp()
      * <p>
      * @throws Exception on error
      */
-    @After
-    public void tearDown()
+    @AfterEach
+    void tearDown()
         throws Exception
     {
         if (receiver != null)
@@ -108,7 +107,7 @@ public void tearDown()
      * @throws Exception on error
      */
     @Test
-    public void testPassiveBroadcast()
+    void testPassiveBroadcast()
         throws Exception
     {
         // SETUP
@@ -120,9 +119,9 @@ public void testPassiveBroadcast()
 
         // VERIFY
         final UDPDiscoveryMessage msg = futureMsg.get(3, TimeUnit.SECONDS);
-        assertNotNull("message not received", msg);
-        assertEquals( "wrong port", SENDING_PORT, msg.getPort() );
-        assertEquals( "wrong message type", BroadcastType.PASSIVE, msg.getMessageType() );
+        assertNotNull( msg, "message not received" );
+        assertEquals( SENDING_PORT, msg.getPort(), "wrong port" );
+        assertEquals( BroadcastType.PASSIVE, msg.getMessageType(), "wrong message type" );
     }
 
     /**
@@ -131,7 +130,7 @@ public void testPassiveBroadcast()
      * @throws Exception on error
      */
     @Test
-    public void testRemoveBroadcast()
+    void testRemoveBroadcast()
         throws Exception
     {
         // SETUP
@@ -143,9 +142,9 @@ public void testRemoveBroadcast()
 
         // VERIFY
         final UDPDiscoveryMessage msg = futureMsg.get(3, TimeUnit.SECONDS);
-        assertNotNull("message not received", msg);
-        assertEquals( "wrong port", SENDING_PORT, msg.getPort() );
-        assertEquals( "wrong message type", BroadcastType.REMOVE, msg.getMessageType() );
+        assertNotNull( msg, "message not received" );
+        assertEquals( SENDING_PORT, msg.getPort(), "wrong port" );
+        assertEquals( BroadcastType.REMOVE, msg.getMessageType(), "wrong message type" );
     }
 
     /**
@@ -154,7 +153,7 @@ public void testRemoveBroadcast()
      * @throws Exception on error
      */
     @Test
-    public void testRequestBroadcast()
+    void testRequestBroadcast()
         throws Exception
     {
         // DO WORK
@@ -162,7 +161,7 @@ public void testRequestBroadcast()
 
         // VERIFY
         final UDPDiscoveryMessage msg = futureMsg.get(3, TimeUnit.SECONDS);
-        assertNotNull("message not received", msg);
-        assertEquals( "wrong message type", BroadcastType.REQUEST, msg.getMessageType() );
+        assertNotNull( msg, "message not received" );
+        assertEquals( BroadcastType.REQUEST, msg.getMessageType(), "wrong message type" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryServiceUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryServiceUnitTest.java
index 878bb0fa4..789a88e03 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryServiceUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryServiceUnitTest.java
@@ -1,9 +1,5 @@
 package org.apache.commons.jcs3.utils.discovery;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -23,14 +19,18 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.util.ArrayList;
 
 import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the service. */
-public class UDPDiscoveryServiceUnitTest
+class UDPDiscoveryServiceUnitTest
 {
     private final static String host = "228.5.6.7";
     private final static int port = 6789;
@@ -38,8 +38,9 @@ public class UDPDiscoveryServiceUnitTest
     private UDPDiscoveryService service;
     private MockDiscoveryListener discoveryListener;
 
-    @Before
-    public void setUp() throws Exception
+    @BeforeEach
+    void setUp()
+        throws Exception
     {
         // SETUP
         final UDPDiscoveryAttributes attributes = new UDPDiscoveryAttributes();
@@ -58,7 +59,7 @@ public void setUp() throws Exception
 
     /** Verify that the list is updated. */
     @Test
-    public void testAddOrUpdateService_InList_NamesChange()
+    void testAddOrUpdateService_InList_NamesChange()
     {
         final DiscoveredService discoveredService = new DiscoveredService();
         discoveredService.setServiceAddress( host );
@@ -80,32 +81,34 @@ public void testAddOrUpdateService_InList_NamesChange()
         service.addOrUpdateService( discoveredService2 );
 
         // VERIFY
-        assertEquals( "Should only be one in the set.", 1, service.getDiscoveredServices().size() );
-        assertTrue( "Service should be in the service list.", service.getDiscoveredServices()
-            .contains( discoveredService ) );
-        assertTrue( "Service should be in the listener list.", discoveryListener.discoveredServices
-            .contains( discoveredService ) );
+        assertEquals( 1, service.getDiscoveredServices().size(), "Should only be one in the set." );
+        assertTrue( service.getDiscoveredServices()
+                        .contains( discoveredService ), "Service should be in the service list." );
+        assertTrue( discoveryListener.discoveredServices
+                        .contains( discoveredService ), "Service should be in the listener list." );
 
         // need to update the time this sucks. add has no effect convert to a map
         for (final DiscoveredService service1 : service.getDiscoveredServices())
         {
             if ( discoveredService.equals( service1 ) )
             {
-                assertEquals( "The match should have the new last heard from time.", service1.getLastHearFromTime(),
-                              discoveredService2.getLastHearFromTime() );
-                assertEquals( "The names should be updated.", service1.getCacheNames() + "", differentCacheNames + "" );
+                assertEquals( service1.getLastHearFromTime(),
+                              discoveredService2.getLastHearFromTime(),
+                              "The match should have the new last heard from time." );
+                assertEquals( service1.getCacheNames() + "", differentCacheNames + "", "The names should be updated." );
             }
         }
         // the mock has a list from all add calls.
         // it should have been called when the list changed.
-        assertEquals( "Mock should have been called twice.", 2, discoveryListener.discoveredServices.size() );
-        assertEquals( "The second mock listener add should be discoveredService2", discoveredService2,
-                      discoveryListener.discoveredServices.get( 1 ) );
+        assertEquals( 2, discoveryListener.discoveredServices.size(), "Mock should have been called twice." );
+        assertEquals( discoveredService2,
+                      discoveryListener.discoveredServices.get( 1 ),
+                      "The second mock listener add should be discoveredService2" );
     }
 
     /** Verify that the list is updated. */
     @Test
-    public void testAddOrUpdateService_InList_NamesDoNotChange()
+    void testAddOrUpdateService_InList_NamesDoNotChange()
     {
         final ArrayList<String> sameCacheNames = new ArrayList<>();
         sameCacheNames.add( "name1" );
@@ -128,31 +131,32 @@ public void testAddOrUpdateService_InList_NamesDoNotChange()
         service.addOrUpdateService( discoveredService2 );
 
         // VERIFY
-        assertEquals( "Should only be one in the set.", 1, service.getDiscoveredServices().size() );
-        assertTrue( "Service should be in the service list.", service.getDiscoveredServices()
-            .contains( discoveredService ) );
-        assertTrue( "Service should be in the listener list.", discoveryListener.discoveredServices
-            .contains( discoveredService ) );
+        assertEquals( 1, service.getDiscoveredServices().size(), "Should only be one in the set." );
+        assertTrue( service.getDiscoveredServices()
+                        .contains( discoveredService ), "Service should be in the service list." );
+        assertTrue( discoveryListener.discoveredServices
+                        .contains( discoveredService ), "Service should be in the listener list." );
 
         // need to update the time this sucks. add has no effect convert to a map
         for (final DiscoveredService service1 : service.getDiscoveredServices())
         {
             if ( discoveredService.equals( service1 ) )
             {
-                assertEquals( "The match should have the new last heard from time.", service1.getLastHearFromTime(),
-                              discoveredService2.getLastHearFromTime() );
+                assertEquals( service1.getLastHearFromTime(),
+                              discoveredService2.getLastHearFromTime(),
+                              "The match should have the new last heard from time." );
             }
         }
         // the mock has a list from all add calls.
         // it should have been called when the list changed.
         //assertEquals( "Mock should have been called once.", 1, discoveryListener.discoveredServices.size() );
         // logic changed.  it's called every time.
-        assertEquals( "Mock should have been called twice.", 2, discoveryListener.discoveredServices.size() );
+        assertEquals( 2, discoveryListener.discoveredServices.size(), "Mock should have been called twice." );
     }
 
     /** Verify that the list is updated. */
     @Test
-    public void testAddOrUpdateService_NotInList()
+    void testAddOrUpdateService_NotInList()
     {
         final DiscoveredService discoveredService = new DiscoveredService();
         discoveredService.setServiceAddress( host );
@@ -164,15 +168,15 @@ public void testAddOrUpdateService_NotInList()
         service.addOrUpdateService( discoveredService );
 
         // VERIFY
-        assertTrue( "Service should be in the service list.", service.getDiscoveredServices()
-            .contains( discoveredService ) );
-        assertTrue( "Service should be in the listener list.", discoveryListener.discoveredServices
-            .contains( discoveredService ) );
+        assertTrue( service.getDiscoveredServices()
+                        .contains( discoveredService ), "Service should be in the service list." );
+        assertTrue( discoveryListener.discoveredServices
+                        .contains( discoveredService ), "Service should be in the listener list." );
     }
 
     /** Verify that the list is updated. */
     @Test
-    public void testRemoveDiscoveredService()
+    void testRemoveDiscoveredService()
     {
         final DiscoveredService discoveredService = new DiscoveredService();
         discoveredService.setServiceAddress( host );
@@ -186,9 +190,9 @@ public void testRemoveDiscoveredService()
         service.removeDiscoveredService( discoveredService );
 
         // VERIFY
-        assertFalse( "Service should not be in the service list.", service.getDiscoveredServices()
-            .contains( discoveredService ) );
-        assertFalse( "Service should not be in the listener list.", discoveryListener.discoveredServices
-            .contains( discoveredService ) );
+        assertFalse( service.getDiscoveredServices()
+                         .contains( discoveredService ), "Service should not be in the service list." );
+        assertFalse( discoveryListener.discoveredServices
+                         .contains( discoveredService ), "Service should not be in the listener list." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryUnitTest.java
index 9f7d08e8a..91977d8dc 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryUnitTest.java
@@ -1,8 +1,5 @@
 package org.apache.commons.jcs3.utils.discovery;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeNotNull;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,17 +19,20 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
 import java.util.ArrayList;
 
 import org.apache.commons.jcs3.utils.net.HostNameUtil;
 import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
 import org.apache.commons.jcs3.utils.timing.SleepUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for discovery
  */
-public class UDPDiscoveryUnitTest
+class UDPDiscoveryUnitTest
 {
     /**
      * <p>
@@ -93,8 +93,8 @@ private void simpleUDPDiscovery(final String discoveryAddress)
             //System.out.println( "Receiver count = " + receiver.getCnt() );
 
             // request braodcasts change things.
-            assertTrue( "Receiver count [" + receiver.getCnt() + "] should be the at least the number sent [" + cnt + "].",
-                        cnt <= receiver.getCnt() );
+            assertTrue( cnt <= receiver.getCnt(),
+                        "Receiver count [" + receiver.getCnt() + "] should be the at least the number sent [" + cnt + "]." );
         }
     }
 
@@ -103,10 +103,10 @@ private void simpleUDPDiscovery(final String discoveryAddress)
      * @throws Exception
      */
     @Test
-    public void testSimpleUDPDiscoveryIPv4()
+    void testSimpleUDPDiscoveryIPv4()
         throws Exception
     {
-        assumeNotNull("This machine does not support multicast", HostNameUtil.getMulticastNetworkInterface());
+        assumeTrue( HostNameUtil.getMulticastNetworkInterface() != null, "This machine does not support multicast" );
 
         simpleUDPDiscovery("228.5.6.7");
     }
@@ -116,10 +116,10 @@ public void testSimpleUDPDiscoveryIPv4()
      * @throws Exception
      */
     @Test
-    public void testSimpleUDPDiscoveryIPv6()
+    void testSimpleUDPDiscoveryIPv6()
         throws Exception
     {
-        assumeNotNull("This machine does not support multicast", HostNameUtil.getMulticastNetworkInterface());
+        assumeTrue( HostNameUtil.getMulticastNetworkInterface() != null, "This machine does not support multicast" );
 
         simpleUDPDiscovery("FF02::5678");
     }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/net/HostNameUtilUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/net/HostNameUtilUnitTest.java
index 1508cbcf1..fac125f7e 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/net/HostNameUtilUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/net/HostNameUtilUnitTest.java
@@ -19,14 +19,14 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.net.UnknownHostException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the host name util. */
-public class HostNameUtilUnitTest
+class HostNameUtilUnitTest
 {
     /**
      * It's nearly impossible to unit test the getLocalHostLANAddress method.
@@ -34,13 +34,14 @@ public class HostNameUtilUnitTest
      * @throws UnknownHostException
      */
     @Test
-    public void testGetLocalHostAddress_Simple() throws UnknownHostException
+    void testGetLocalHostAddress_Simple()
+        throws UnknownHostException
     {
         // DO WORK
         final String result = HostNameUtil.getLocalHostAddress();
 
         // VERIFY
         //System.out.print( result );
-        assertNotNull( "Should have a host address.", result );
+        assertNotNull( result, "Should have a host address." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/CompressingSerializerUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/CompressingSerializerUnitTest.java
index 3dfede6e8..0b4a893e7 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/CompressingSerializerUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/CompressingSerializerUnitTest.java
@@ -19,24 +19,25 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the compressing serializer.
  */
-public class CompressingSerializerUnitTest
+class CompressingSerializerUnitTest
 {
     private CompressingSerializer serializer;
 
-    @Before
-    public void setUp() throws Exception
+    @BeforeEach
+    void setUp()
+        throws Exception
     {
         this.serializer = new CompressingSerializer();
     }
@@ -48,14 +49,14 @@ public void setUp() throws Exception
      * @throws IOException
      */
     @Test
-    public void testDeserialize_NullInput()
+    void testDeserialize_NullInput()
         throws IOException, ClassNotFoundException
     {
         // DO WORK
         final Object result = serializer.deSerialize( null, null );
 
         // VERIFY
-        assertNull( "Should have nothing.", result );
+        assertNull( result, "Should have nothing." );
     }
 
     /**
@@ -64,7 +65,7 @@ public void testDeserialize_NullInput()
      * @throws Exception on error
      */
     @Test
-    public void testSerialize_CompareCompressedAndUncompressed()
+    void testSerialize_CompareCompressedAndUncompressed()
         throws Exception
     {
         // I hate for loops.
@@ -80,8 +81,9 @@ public void testSerialize_CompareCompressedAndUncompressed()
         final byte[] nonCompressed = new StandardSerializer().serialize( before );
 
         // VERIFY
-        assertTrue( "Compressed should be smaller. compressed size = " + compressed.length + "nonCompressed size = "
-            + nonCompressed.length, compressed.length < nonCompressed.length );
+        assertTrue( compressed.length < nonCompressed.length,
+                    "Compressed should be smaller. compressed size = " + compressed.length + "nonCompressed size = "
+                        + nonCompressed.length );
     }
 
     /**
@@ -90,7 +92,7 @@ public void testSerialize_CompareCompressedAndUncompressed()
      * @throws Exception on error
      */
     @Test
-    public void testSerialize_NullInput()
+    void testSerialize_NullInput()
         throws Exception
     {
         final String before = null;
@@ -100,7 +102,7 @@ public void testSerialize_NullInput()
         final String after = (String) serializer.deSerialize( serialized, null );
 
         // VERIFY
-        assertNull( "Should have nothing. after =" + after, after );
+        assertNull( after, "Should have nothing. after =" + after );
     }
 
     /**
@@ -111,7 +113,7 @@ public void testSerialize_NullInput()
      * @throws Exception on error
      */
     @Test
-    public void testSimpleBackAndForth()
+    void testSimpleBackAndForth()
         throws Exception
     {
         // DO WORK
@@ -119,6 +121,6 @@ public void testSimpleBackAndForth()
         final String after = (String) serializer.deSerialize( serializer.serialize( before ), null );
 
         // VERIFY
-        assertEquals( "Before and after should be the same.", before, after );
+        assertEquals( before, after, "Before and after should be the same." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/EncryptingSerializerUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/EncryptingSerializerUnitTest.java
index 71369ddb1..1d4d7f781 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/EncryptingSerializerUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/EncryptingSerializerUnitTest.java
@@ -19,24 +19,25 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.IOException;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the encrypting serializer.
  */
-public class EncryptingSerializerUnitTest
+class EncryptingSerializerUnitTest
 {
     private EncryptingSerializer serializer;
 
-    @Before
-    public void setUp() throws Exception
+    @BeforeEach
+    void setUp()
+        throws Exception
     {
         this.serializer = new EncryptingSerializer();
         this.serializer.setPreSharedKey("my_secret_key");
@@ -49,14 +50,14 @@ public void setUp() throws Exception
      * @throws IOException
      */
     @Test
-    public void testDeserialize_NullInput()
+    void testDeserialize_NullInput()
         throws IOException, ClassNotFoundException
     {
         // DO WORK
         final Object result = serializer.deSerialize( null, null );
 
         // VERIFY
-        assertNull( "Should have nothing.", result );
+        assertNull( result, "Should have nothing." );
     }
 
     /**
@@ -65,7 +66,7 @@ public void testDeserialize_NullInput()
      * @throws Exception on error
      */
     @Test
-    public void testDifferentKey()
+    void testDifferentKey()
         throws Exception
     {
         // DO WORK
@@ -84,7 +85,7 @@ public void testDifferentKey()
      * @throws Exception on error
      */
     @Test
-    public void testGCMBackAndForth()
+    void testGCMBackAndForth()
         throws Exception
     {
         this.serializer.setAesCipherTransformation("AES/GCM/NoPadding");
@@ -94,7 +95,7 @@ public void testGCMBackAndForth()
         final String after = serializer.deSerialize( serializer.serialize( before ), null );
 
         // VERIFY
-        assertEquals( "Before and after should be the same.", before, after );
+        assertEquals( before, after, "Before and after should be the same." );
     }
 
     /**
@@ -103,7 +104,7 @@ public void testGCMBackAndForth()
      * @throws Exception on error
      */
     @Test
-    public void testSerialize_NullInput()
+    void testSerialize_NullInput()
         throws Exception
     {
         final String before = null;
@@ -113,7 +114,7 @@ public void testSerialize_NullInput()
         final String after = (String) serializer.deSerialize( serialized, null );
 
         // VERIFY
-        assertNull( "Should have nothing. after =" + after, after );
+        assertNull( after, "Should have nothing. after =" + after );
     }
 
     /**
@@ -124,7 +125,7 @@ public void testSerialize_NullInput()
      * @throws Exception on error
      */
     @Test
-    public void testSimpleBackAndForth()
+    void testSimpleBackAndForth()
         throws Exception
     {
         // DO WORK
@@ -132,6 +133,6 @@ public void testSimpleBackAndForth()
         final String after = serializer.deSerialize( serializer.serialize( before ), null );
 
         // VERIFY
-        assertEquals( "Before and after should be the same.", before, after );
+        assertEquals( before, after, "Before and after should be the same." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/SerializationConversionUtilUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/SerializationConversionUtilUnitTest.java
index 8c546092f..c5cb248e4 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/SerializationConversionUtilUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/SerializationConversionUtilUnitTest.java
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 
@@ -32,12 +32,12 @@
 import org.apache.commons.jcs3.engine.behavior.ICacheElementSerialized;
 import org.apache.commons.jcs3.engine.behavior.IElementAttributes;
 import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the serialization conversion util.
  */
-public class SerializationConversionUtilUnitTest
+class SerializationConversionUtilUnitTest
 {
     /**
      * Verify that we can go back and forth with the simplest of objects.
@@ -45,7 +45,7 @@ public class SerializationConversionUtilUnitTest
      * @throws Exception
      */
     @Test
-    public void testAccidentalDoubleConversion()
+    void testAccidentalDoubleConversion()
         throws Exception
     {
         // SETUP
@@ -68,19 +68,19 @@ public void testAccidentalDoubleConversion()
             SerializationConversionUtil.getSerializedCacheElement( alreadySerialized, elementSerializer );
 
         // VERIFY
-        assertNotNull( "Should have a serialized object.", serialized );
+        assertNotNull( serialized, "Should have a serialized object." );
 
         // DO WORK
         final ICacheElement<String, String> after =
             SerializationConversionUtil.getDeSerializedCacheElement( serialized, elementSerializer );
 
         // VERIFY
-        assertNotNull( "Should have a deserialized object.", after );
-        assertEquals( "Values should be the same.", before.getVal(), after.getVal() );
-        assertEquals( "Attributes should be the same.", before.getElementAttributes().getMaxLife(), after
-            .getElementAttributes().getMaxLife() );
-        assertEquals( "Keys should be the same.", before.getKey(), after.getKey() );
-        assertEquals( "Cache name should be the same.", before.getCacheName(), after.getCacheName() );
+        assertNotNull( after, "Should have a deserialized object." );
+        assertEquals( before.getVal(), after.getVal(), "Values should be the same." );
+        assertEquals( before.getElementAttributes().getMaxLife(), after
+            .getElementAttributes().getMaxLife(), "Attributes should be the same." );
+        assertEquals( before.getKey(), after.getKey(), "Keys should be the same." );
+        assertEquals( before.getCacheName(), after.getCacheName(), "Cache name should be the same." );
     }
 
     /**
@@ -89,7 +89,7 @@ public void testAccidentalDoubleConversion()
      * @throws Exception
      */
     @Test
-    public void testgGetDeSerializedCacheElement_null()
+    void testgGetDeSerializedCacheElement_null()
         throws Exception
     {
         // SETUP
@@ -101,7 +101,7 @@ public void testgGetDeSerializedCacheElement_null()
             SerializationConversionUtil.getDeSerializedCacheElement( before, elementSerializer );
 
         // VERIFY
-        assertNull( "Should get null for null", result );
+        assertNull( result, "Should get null for null" );
     }
 
     /**
@@ -110,7 +110,7 @@ public void testgGetDeSerializedCacheElement_null()
      * @throws IOException
      */
     @Test
-    public void testgGetSerializedCacheElement_null()
+    void testgGetSerializedCacheElement_null()
         throws IOException
     {
         // SETUP
@@ -122,14 +122,14 @@ public void testgGetSerializedCacheElement_null()
             SerializationConversionUtil.getSerializedCacheElement( before, elementSerializer );
 
         // VERIFY
-        assertNull( "Should get null for null", result );
+        assertNull( result, "Should get null for null" );
     }
 
     /**
      * Verify that we get an IOException for a null serializer.
      */
     @Test
-    public void testNullSerializerConversion()
+    void testNullSerializerConversion()
     {
         // SETUP
         final String cacheName = "testName";
@@ -164,7 +164,7 @@ public void testNullSerializerConversion()
      * @throws Exception
      */
     @Test
-    public void testSimpleConversion()
+    void testSimpleConversion()
         throws Exception
     {
         // SETUP
@@ -185,18 +185,18 @@ public void testSimpleConversion()
             SerializationConversionUtil.getSerializedCacheElement( before, elementSerializer );
 
         // VERIFY
-        assertNotNull( "Should have a serialized object.", serialized );
+        assertNotNull( serialized, "Should have a serialized object." );
 
         // DO WORK
         final ICacheElement<String, String> after =
             SerializationConversionUtil.getDeSerializedCacheElement( serialized, elementSerializer );
 
         // VERIFY
-        assertNotNull( "Should have a deserialized object.", after );
-        assertEquals( "Values should be the same.", before.getVal(), after.getVal() );
-        assertEquals( "Attributes should be the same.", before.getElementAttributes().getMaxLife(), after
-            .getElementAttributes().getMaxLife() );
-        assertEquals( "Keys should be the same.", before.getKey(), after.getKey() );
-        assertEquals( "Cache name should be the same.", before.getCacheName(), after.getCacheName() );
+        assertNotNull( after, "Should have a deserialized object." );
+        assertEquals( before.getVal(), after.getVal(), "Values should be the same." );
+        assertEquals( before.getElementAttributes().getMaxLife(), after
+            .getElementAttributes().getMaxLife(), "Attributes should be the same." );
+        assertEquals( before.getKey(), after.getKey(), "Keys should be the same." );
+        assertEquals( before.getCacheName(), after.getCacheName(), "Cache name should be the same." );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/SerializerUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/SerializerUnitTest.java
index 100fd687e..59733729f 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/SerializerUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/SerializerUnitTest.java
@@ -19,33 +19,34 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.CacheAccess;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Verify that serializer functionality works.
  */
-public class SerializerUnitTest
+class SerializerUnitTest
 {
     /**
      * Test setup
      * <p>
      * @throws Exception
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
         throws Exception
     {
         JCS.setConfigFilename( "/TestElementSerializer.ccf" );
     }
 
-    @After
-    public void tearDown() throws Exception
+    @AfterEach
+    void tearDown()
+        throws Exception
     {
         JCS.shutdown();
     }
@@ -56,7 +57,7 @@ public void tearDown() throws Exception
      * @throws Exception
      */
     @Test
-    public void testReadWrite()
+    void testReadWrite()
         throws Exception
     {
         final int count = 500; // 100 fit in memory
@@ -71,7 +72,7 @@ public void testReadWrite()
         for ( int i = 0; i < count; i++ )
         {
             final String res = jcs1.get( "key:" + i );
-            assertNotNull( "[key:" + i + "] should not be null, " + jcs1.getStats(), res );
+            assertNotNull( res, "[key:" + i + "] should not be null, " + jcs1.getStats() );
         }
 
         // EncryptingSerializer
@@ -85,7 +86,7 @@ public void testReadWrite()
         for ( int i = 0; i < count; i++ )
         {
             final String res = jcs2.get( "key:" + i );
-            assertNotNull( "[key:" + i + "] should not be null, " + jcs2.getStats(), res );
+            assertNotNull( res, "[key:" + i + "] should not be null, " + jcs2.getStats() );
         }
 
         JCS.shutdown();
@@ -97,7 +98,7 @@ public void testReadWrite()
         for ( int i = 0; i < count; i++ )
         {
             final String res = jcs3.get( "key:" + i );
-            assertNotNull( "[key:" + i + "] should not be null, " + jcs3.getStats(), res );
+            assertNotNull( res, "[key:" + i + "] should not be null, " + jcs3.getStats() );
         }
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/StandardSerializerUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/StandardSerializerUnitTest.java
index 4c45f3d8e..472855518 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/StandardSerializerUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/serialization/StandardSerializerUnitTest.java
@@ -19,22 +19,22 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.IOException;
 import java.io.InvalidClassException;
 
 import org.apache.commons.collections4.bag.HashBag;
 import org.apache.commons.jcs3.io.ObjectInputStreamClassLoaderAware;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the standard serializer.
  */
-public class StandardSerializerUnitTest
+class StandardSerializerUnitTest
 {
     private StandardSerializer serializer;
 
@@ -43,8 +43,8 @@ public class StandardSerializerUnitTest
      * <p>
      * @throws Exception
      */
-    @Before
-    public void setUp()
+    @BeforeEach
+    void setUp()
         throws Exception
     {
 	// Override filter expression for ObjectInputFilter
@@ -59,7 +59,7 @@ public void setUp()
      * @throws Exception
      */
     @Test
-    public void testBigStringBackAndForth()
+    void testBigStringBackAndForth()
         throws Exception
     {
         final String string = "This is my big string ABCDEFGH";
@@ -75,7 +75,7 @@ public void testBigStringBackAndForth()
         final String after = (String) serializer.deSerialize( serializer.serialize( before ), null );
 
         // VERIFY
-        assertEquals( "Before and after should be the same.", before, after );
+        assertEquals( before, after, "Before and after should be the same." );
     }
 
     /**
@@ -84,7 +84,7 @@ public void testBigStringBackAndForth()
      * @throws Exception
      */
     @Test
-    public void testNullInput()
+    void testNullInput()
         throws Exception
     {
         final String before = null;
@@ -97,7 +97,7 @@ public void testNullInput()
         //System.out.println( "testNullInput " + after );
 
         // VERIFY
-        assertNull( "Should have nothing.", after );
+        assertNull( after, "Should have nothing." );
     }
 
     /**
@@ -106,7 +106,7 @@ public void testNullInput()
      * @throws Exception
      */
     @Test
-    public void testSimpleBackAndForth()
+    void testSimpleBackAndForth()
         throws Exception
     {
         final String before = "adsfdsafdsafdsafdsafdsafdsafdsagfdsafdsafdsfdsafdsafsa333 31231";
@@ -115,7 +115,7 @@ public void testSimpleBackAndForth()
         final String after = (String) serializer.deSerialize( serializer.serialize( before ), null );
 
         // VERIFY
-        assertEquals( "Before and after should be the same.", before, after );
+        assertEquals( before, after, "Before and after should be the same." );
     }
 
     /**
@@ -124,7 +124,7 @@ public void testSimpleBackAndForth()
      * @throws IOException
      */
     @Test
-    public void testDeserializationFilter()
+    void testDeserializationFilter()
         throws IOException
     {
         // DO WORK
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/DoubleLinkedListDumpUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/DoubleLinkedListDumpUnitTest.java
index 78c03ba09..90658d570 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/DoubleLinkedListDumpUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/DoubleLinkedListDumpUnitTest.java
@@ -19,19 +19,19 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.StringWriter;
 
 import org.apache.commons.jcs3.TestLogConfigurationUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the double linked list. */
-public class DoubleLinkedListDumpUnitTest
+class DoubleLinkedListDumpUnitTest
 {
     /** Verify that the entries are dumped. */
     @Test
-    public void testDumpEntries_DebugTrue()
+    void testDumpEntries_DebugTrue()
     {
         // SETUP
         final StringWriter stringWriter = new StringWriter();
@@ -53,7 +53,7 @@ public void testDumpEntries_DebugTrue()
         final String result = stringWriter.toString();
 
         // VERIFY
-        assertTrue( "Missing node in log dump", result.indexOf( payload1 ) != -1 );
-        assertTrue( "Missing node in log dump", result.indexOf( payload2 ) != -1 );
+        assertTrue( result.indexOf( payload1 ) != -1, "Missing node in log dump" );
+        assertTrue( result.indexOf( payload2 ) != -1, "Missing node in log dump" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/DoubleLinkedListUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/DoubleLinkedListUnitTest.java
index af03c63a9..be88a1019 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/DoubleLinkedListUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/DoubleLinkedListUnitTest.java
@@ -19,16 +19,16 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for the double linked list. */
-public class DoubleLinkedListUnitTest
+class DoubleLinkedListUnitTest
 {
     /** Verify that the last is added when the list is empty. */
     @Test
-    public void testAddLast_Empty()
+    void testAddLast_Empty()
     {
         // SETUP
         final DoubleLinkedList<DoubleLinkedListNode<String>> list = new DoubleLinkedList<>();
@@ -40,12 +40,12 @@ public void testAddLast_Empty()
         list.addLast( node1 );
 
         // VERIFY
-        assertEquals( "Wrong last", node1, list.getLast() );
+        assertEquals( node1, list.getLast(), "Wrong last" );
     }
 
     /** Verify that the last is added when the list is empty. */
     @Test
-    public void testAddLast_NotEmpty()
+    void testAddLast_NotEmpty()
     {
         // SETUP
         final DoubleLinkedList<DoubleLinkedListNode<String>> list = new DoubleLinkedList<>();
@@ -61,12 +61,12 @@ public void testAddLast_NotEmpty()
         list.addLast( node2 );
 
         // VERIFY
-        assertEquals( "Wrong last", node2, list.getLast() );
+        assertEquals( node2, list.getLast(), "Wrong last" );
     }
 
     /** Verify that it's added last. */
     @Test
-    public void testMakeLast_wasAlone()
+    void testMakeLast_wasAlone()
     {
         // SETUP
         final DoubleLinkedList<DoubleLinkedListNode<String>> list = new DoubleLinkedList<>();
@@ -80,14 +80,14 @@ public void testMakeLast_wasAlone()
         list.makeLast( node1 );
 
         // VERIFY
-        assertEquals( "Wrong size", 1, list.size() );
-        assertEquals( "Wrong last", node1, list.getLast() );
-        assertEquals( "Wrong first", node1, list.getFirst() );
+        assertEquals( 1, list.size(), "Wrong size" );
+        assertEquals( node1, list.getLast(), "Wrong last" );
+        assertEquals( node1, list.getFirst(), "Wrong first" );
     }
 
     /** Verify that it's added last. */
     @Test
-    public void testMakeLast_wasFirst()
+    void testMakeLast_wasFirst()
     {
         // SETUP
         final DoubleLinkedList<DoubleLinkedListNode<String>> list = new DoubleLinkedList<>();
@@ -105,14 +105,14 @@ public void testMakeLast_wasFirst()
         list.makeLast( node1 );
 
         // VERIFY
-        assertEquals( "Wrong size", 2, list.size() );
-        assertEquals( "Wrong last", node1, list.getLast() );
-        assertEquals( "Wrong first", node2, list.getFirst() );
+        assertEquals( 2, list.size(), "Wrong size" );
+        assertEquals( node1, list.getLast(), "Wrong last" );
+        assertEquals( node2, list.getFirst(), "Wrong first" );
     }
 
     /** Verify that it's added last. */
     @Test
-    public void testMakeLast_wasInMiddle()
+    void testMakeLast_wasInMiddle()
     {
         // SETUP
         final DoubleLinkedList<DoubleLinkedListNode<String>> list = new DoubleLinkedList<>();
@@ -134,14 +134,14 @@ public void testMakeLast_wasInMiddle()
         list.makeLast( node1 );
 
         // VERIFY
-        assertEquals( "Wrong size", 3, list.size() );
-        assertEquals( "Wrong last", node1, list.getLast() );
-        assertEquals( "Wrong first", node3, list.getFirst() );
+        assertEquals( 3, list.size(), "Wrong size" );
+        assertEquals( node1, list.getLast(), "Wrong last" );
+        assertEquals( node3, list.getFirst(), "Wrong first" );
     }
 
     /** Verify that it's added last. */
     @Test
-    public void testMakeLast_wasLast()
+    void testMakeLast_wasLast()
     {
         // SETUP
         final DoubleLinkedList<DoubleLinkedListNode<String>> list = new DoubleLinkedList<>();
@@ -159,8 +159,8 @@ public void testMakeLast_wasLast()
         list.makeLast( node1 );
 
         // VERIFY
-        assertEquals( "Wrong size", 2, list.size() );
-        assertEquals( "Wrong last", node1, list.getLast() );
-        assertEquals( "Wrong first", node2, list.getFirst() );
+        assertEquals( 2, list.size(), "Wrong size" );
+        assertEquals( node1, list.getLast(), "Wrong last" );
+        assertEquals( node2, list.getFirst(), "Wrong first" );
     }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java
index d3bc92693..d1de1ad0d 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java
@@ -19,13 +19,13 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Map;
 
 import org.apache.commons.jcs3.log.Log;
 import org.apache.commons.jcs3.log.LogManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * This ensures that the jcs version of the LRU map is as fast as the commons
@@ -161,7 +161,7 @@ public void doWork()
      *                Description of the Exception
      */
     @Test
-    public void testSimpleLoad()
+    void testSimpleLoad()
         throws Exception
     {
         final Log log = LogManager.getLog( LRUMap.class );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/LRUMapConcurrentUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/LRUMapConcurrentUnitTest.java
index 08b38a81d..3dd033773 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/LRUMapConcurrentUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/LRUMapConcurrentUnitTest.java
@@ -19,30 +19,28 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.Iterator;
 
-import junit.extensions.ActiveTestSuite;
-import junit.framework.TestCase;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the LRUMap
  */
-public class LRUMapConcurrentUnitTest
+class LRUMapConcurrentUnitTest
 {
-    /** Number to test with */
+
+    // Number to test with
     private static final int items = 20000;
 
     /**
      * Just make sure that we can put and get concurrently
      *
-     * @param map
-     * @param items
-     * @throws Exception
+     * @param map LRUMap instance
+     * @param items Number of items to test with
+     * @throws Exception If an error occurs
      */
     public static void runConcurrentPutGetTests( final LRUMap<String, String> map, final int items )
         throws Exception
@@ -55,18 +53,18 @@ public static void runConcurrentPutGetTests( final LRUMap<String, String> map, f
         for ( int i = items - 1; i >= 0; i-- )
         {
             final String res = map.get( i + ":key" );
-            assertNotNull( "[" + i + ":key] should not be null", res );
+            assertNotNull( res, "[" + i + ":key] should not be null" );
         }
     }
 
     /**
      * Put, get, and remove from a range. This should occur at a range that is
      * not touched by other tests.
-     * <p>
-     * @param map
-     * @param start
-     * @param end
-     * @throws Exception
+     *
+     * @param map LRUMap instance
+     * @param start Start index of the range
+     * @param end End index of the range
+     * @throws Exception If an error occurs
      */
     public static void runConcurrentRangeTests( final LRUMap<String, String> map, final int start, final int end )
         throws Exception
@@ -79,93 +77,22 @@ public static void runConcurrentRangeTests( final LRUMap<String, String> map, fi
         for ( int i = end - 1; i >= start; i-- )
         {
             final String res = map.get( i + ":key" );
-            assertNotNull( "[" + i + ":key] should not be null", res );
+            assertNotNull( res, "[" + i + ":key] should not be null" );
         }
 
-        // test removal
+        // Test removal
         map.remove( start + ":key" );
         assertNull( map.get( start + ":key" ) );
     }
 
-    /**
-     * A unit test suite for JUnit
-     * <p>
-     * @return The test suite
-     */
-    public static junit.framework.Test suite()
-    {
-        // run the basic tests
-        final ActiveTestSuite suite = new ActiveTestSuite();
-
-        // run concurrent tests
-        final LRUMap<String, String> map = new LRUMap<>( 2000 );
-        suite.addTest(new TestCase("conc1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runConcurrentPutGetTests( map, 2000 );
-            }
-        });
-        suite.addTest(new TestCase("conc2" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runConcurrentPutGetTests( map, 2000 );
-            }
-        });
-        suite.addTest(new TestCase("conc3" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runConcurrentPutGetTests( map, 2000 );
-            }
-        });
-
-        // run more concurrent tests
-        final int max2 = 20000;
-        final LRUMap<String, String> map2 = new LRUMap<>( max2 );
-        suite.addTest(new TestCase("concB1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runConcurrentRangeTests( map2, 10000, max2 );
-            }
-        });
-        suite.addTest(new TestCase("concB1" )
-        {
-            @Override
-            public void runTest()
-                throws Exception
-            {
-                runConcurrentRangeTests( map2, 0, 9999 );
-            }
-        });
-
-        return suite;
-    }
-
-    /**
-     * Just make sure that the LRU functions in he most simple case.
-     *
-     * @throws Exception
-     *                Description of the Exception
-     */
     @Test
-    public void testLRURemoval()
+    void testLRURemoval()
         throws Exception
     {
         final int total = 10;
         final LRUMap<String, String> map = new LRUMap<>( total );
 
-        // put the max in
+        // Put the max in
         for ( int i = 0; i < total; i++ )
         {
             map.put( i + ":key", "data" + i );
@@ -177,59 +104,48 @@ public void testLRURemoval()
             assertNotNull( it.next() );
         }
 
-        // get the max out backwards
+        // Get the max out backwards
         for ( int i = total - 1; i >= 0; i-- )
         {
             final String res = map.get( i + ":key" );
-            assertNotNull( "[" + i + ":key] should not be null", res );
+            assertNotNull( res, "[" + i + ":key] should not be null" );
         }
 
-        //since we got them backwards the total should be at the end.
-        // add one confirm that total is gone.
+        // Since we got them backwards the total should be at the end.
+        // Add one and confirm that total is gone.
         map.put( total + ":key", "data" + total );
         assertNull( map.get( total - 1 + ":key" ) );
     }
 
-    /**
-     * @throws Exception
-     */
     @Test
-    public void testLRURemovalAgain()
+    void testLRURemovalAgain()
         throws Exception
     {
         final int total = 10000;
         final LRUMap<String, String> map = new LRUMap<>( total );
 
-        // put the max in
+        // Put the max in
         for ( int i = 0; i < total * 2; i++ )
         {
             map.put( i + ":key", "data" + i );
         }
 
-        // get the total number, these should be null
+        // Get the total number, these should be null
         for ( int i = total - 1; i >= 0; i-- )
         {
             assertNull( map.get( i + ":key" ) );
         }
 
-        // get the total to total *2 items out, these should be found.
+        // Get the total to total *2 items out, these should be found.
         for ( int i = total * 2 - 1; i >= total; i-- )
         {
             final String res = map.get( i + ":key" );
-            assertNotNull( "[" + i + ":key] should not be null", res );
+            assertNotNull( res, "[" + i + ":key] should not be null" );
         }
-
-//        System.out.println( map.getStatistics() );
     }
 
-    /**
-     * Just test that we can put, get and remove as expected.
-     * <p>
-     * @throws Exception
-     *                Description of the Exception
-     */
     @Test
-    public void testSimpleLoad()
+    void testSimpleLoad()
         throws Exception
     {
         final LRUMap<String, String> map = new LRUMap<>( items );
@@ -242,11 +158,32 @@ public void testSimpleLoad()
         for ( int i = items - 1; i >= 0; i-- )
         {
             final String res = map.get( i + ":key" );
-            assertNotNull( "[" + i + ":key] should not be null", res );
+            assertNotNull( res, "[" + i + ":key] should not be null" );
         }
 
-        // test removal
+        // Test removal
         map.remove( "300:key" );
         assertNull( map.get( "300:key" ) );
     }
+
+    @Test
+    void testConcurrentPutGet()
+        throws Exception
+    {
+        final LRUMap<String, String> map = new LRUMap<>( 2000 );
+
+        // Run concurrent put/get tests
+        runConcurrentPutGetTests( map, 2000 );
+    }
+
+    @Test
+    void testConcurrentRange()
+        throws Exception
+    {
+        final LRUMap<String, String> map = new LRUMap<>( 20000 );
+
+        // Run concurrent range tests
+        runConcurrentRangeTests( map, 10000, 20000 );
+        runConcurrentRangeTests( map, 0, 10000 );
+    }
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/LRUMapPerformanceTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/LRUMapPerformanceTest.java
index 12a33f09e..03e402f72 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/LRUMapPerformanceTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/LRUMapPerformanceTest.java
@@ -19,11 +19,11 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * This ensures that the jcs version of the LRU map is as fast as the commons
@@ -164,7 +164,7 @@ public void doWork()
      *                Description of the Exception
      */
     @Test
-    public void testSimpleLoad()
+    void testSimpleLoad()
         throws Exception
     {
         doWork();
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/LRUMapUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/LRUMapUnitTest.java
index 15a5d8d2e..5a15e9112 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/LRUMapUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/LRUMapUnitTest.java
@@ -19,27 +19,27 @@
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Basic unit tests for the LRUMap
  */
-public class LRUMapUnitTest
+class LRUMapUnitTest
 {
 
     /**
      * Add items to the map and then test to see that they come back in the entry set.
      */
     @Test
-    public void testGetEntrySet()
+    void testGetEntrySet()
     {
         final int size = 10;
         final Map<String, String> cache = new LRUMap<>( size );
@@ -50,12 +50,12 @@ public void testGetEntrySet()
         }
 
         final Set<Entry<String, String>> entries = cache.entrySet();
-        assertEquals( "Set contains the wrong number of items.", size, entries.size() );
+        assertEquals( size, entries.size(), "Set contains the wrong number of items." );
 
         // check minimal correctness
         for (final Entry<String, String> data : entries)
         {
-            assertTrue( "Data is wrong.", data.getValue().indexOf( "data:") != -1  );
+            assertTrue( data.getValue().indexOf( "data:" ) != -1, "Data is wrong." );
         }
     }
 
@@ -63,21 +63,21 @@ public void testGetEntrySet()
      * Put and then remove.  Make sure the element is returned.
      */
     @Test
-    public void testPutAndRemove()
+    void testPutAndRemove()
     {
         final int size = 10;
         final Map<String, String> cache = new LRUMap<>( size );
 
         cache.put( "key:" + 1, "data:" + 1 );
         final String data = cache.remove( "key:" + 1 );
-        assertEquals( "Data is wrong.", "data:" + 1, data );
+        assertEquals( "data:" + 1, data, "Data is wrong." );
     }
 
     /**
      * Put into the lru with no limit and then make sure they are all there.
      */
     @Test
-    public void testPutWithNoSizeLimit()
+    void testPutWithNoSizeLimit()
     {
         final int size = 10;
         final Map<String, String> cache = new LRUMap<>( );
@@ -90,7 +90,7 @@ public void testPutWithNoSizeLimit()
         for ( int i = 0; i < size; i++ )
         {
             final String data = cache.get( "key:" + i );
-            assertEquals( "Data is wrong.", "data:" + i, data );
+            assertEquals( "data:" + i, data, "Data is wrong." );
         }
     }
 
@@ -98,7 +98,7 @@ public void testPutWithNoSizeLimit()
      * Put up to the size limit and then make sure they are all there.
      */
     @Test
-    public void testPutWithSizeLimit()
+    void testPutWithSizeLimit()
     {
         final int size = 10;
         final Map<String, String> cache = new LRUMap<>( size );
@@ -111,7 +111,7 @@ public void testPutWithSizeLimit()
         for ( int i = 0; i < size; i++ )
         {
             final String data = cache.get( "key:" + i );
-            assertEquals( "Data is wrong.", "data:" + i, data );
+            assertEquals( "data:" + i, data, "Data is wrong." );
         }
     }
 
@@ -119,13 +119,13 @@ public void testPutWithSizeLimit()
      * Call remove on an empty map
      */
     @Test
-    public void testRemoveEmpty()
+    void testRemoveEmpty()
     {
         final int size = 10;
         final Map<String, String> cache = new LRUMap<>( size );
 
         final Object returned = cache.remove( "key:" + 1 );
-        assertNull( "Shouldn't hvae anything.", returned );
+        assertNull( returned, "Shouldn't hvae anything." );
     }
 
 }
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/threadpool/ThreadPoolManagerUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/threadpool/ThreadPoolManagerUnitTest.java
index 219c40ca6..911de0d02 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/threadpool/ThreadPoolManagerUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/threadpool/ThreadPoolManagerUnitTest.java
@@ -1,8 +1,5 @@
 package org.apache.commons.jcs3.utils.threadpool;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,25 +19,28 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
 import org.apache.commons.jcs3.utils.props.PropertyLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Verify that the manager can create pools as intended by the default and
  * specified file names.
  */
-public class ThreadPoolManagerUnitTest
+class ThreadPoolManagerUnitTest
 {
 
     /**
      * Make sure it can load a default cache.ccf file
      */
     @Test
-    public void testDefaultConfig()
+    void testDefaultConfig()
     {
         final Properties props = PropertyLoader.loadProperties( "thread_pool.properties" );
         ThreadPoolManager.setProps( props );
@@ -55,7 +55,7 @@ public void testDefaultConfig()
      * Gets a couple pools by name and then see if they are in the list.
      */
     @Test
-    public void testGetPoolNames()
+    void testGetPoolNames()
     {
         final ThreadPoolManager mgr = ThreadPoolManager.getInstance();
         assertNotNull( mgr );
@@ -67,15 +67,15 @@ public void testGetPoolNames()
         mgr.getExecutorService( poolName2 );
 
         final Set<String> names = mgr.getPoolNames();
-        assertTrue( "Should have name in list.", names.contains( poolName1 ) );
-        assertTrue( "Should have name in list.", names.contains( poolName2 ) );
+        assertTrue( names.contains( poolName1 ), "Should have name in list." );
+        assertTrue( names.contains( poolName2 ), "Should have name in list." );
     }
 
     /**
      * Make sure it can load a certain configuration
      */
     @Test
-    public void testSpecialConfig()
+    void testSpecialConfig()
     {
         final Properties props = PropertyLoader.loadProperties( "thread_pool.properties" );
         ThreadPoolManager.setProps( props );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/zip/CompressionUtilUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/zip/CompressionUtilUnitTest.java
index a6f1c5481..34da2025e 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/zip/CompressionUtilUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/zip/CompressionUtilUnitTest.java
@@ -19,9 +19,9 @@
  * under the License.
  */
 
-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;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -47,7 +47,7 @@ public final void testCompressDecompressByteArray_success()
 
         // VERIFY
         final String result = new String( output );
-        assertNotNull( "decompressed output stream shouldn't have been null ", output );
+        assertNotNull( output, "decompressed output stream shouldn't have been null " );
         assertEquals( text, result );
     }
 
@@ -74,7 +74,7 @@ public final void testCompressDecompressGzipByteArray_success()
 
         // VERIFY
         final String result = new String( output );
-        assertNotNull( "decompressed output stream shouldn't have been null ", output );
+        assertNotNull( output, "decompressed output stream shouldn't have been null " );
         assertEquals( text, result );
     }
 
diff --git a/commons-jcs3-jcache-extras/pom.xml b/commons-jcs3-jcache-extras/pom.xml
index b73486b6d..1d6473483 100644
--- a/commons-jcs3-jcache-extras/pom.xml
+++ b/commons-jcs3-jcache-extras/pom.xml
@@ -53,11 +53,6 @@
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.openwebbeans</groupId>
       <artifactId>openwebbeans-impl</artifactId>
diff --git a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/InternalCacheExtension.java b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/InternalCacheExtension.java
new file mode 100644
index 000000000..df9367c88
--- /dev/null
+++ b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/InternalCacheExtension.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.commons.jcs3.jcache.extras;
+
+import java.lang.reflect.Field;
+
+import javax.cache.Cache;
+import javax.cache.CacheManager;
+import javax.cache.Caching;
+import javax.cache.configuration.CompleteConfiguration;
+import javax.cache.configuration.Configuration;
+import javax.cache.spi.CachingProvider;
+
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+// TODO: *if needed* define @CacheDeifnition instead of relying on field types
+public class InternalCacheExtension
+    implements BeforeEachCallback, AfterEachCallback
+{
+
+    private CachingProvider cachingProvider;
+
+    private CacheManager cacheManager;
+
+    @Override
+    public void beforeEach( ExtensionContext context )
+        throws Exception
+    {
+        cachingProvider = Caching.getCachingProvider();
+        cacheManager = cachingProvider.getCacheManager();
+
+        Field cacheField = null;
+        CompleteConfiguration<?, ?> config = null;
+
+        for ( Field field : context.getTestInstance().get().getClass().getDeclaredFields() )
+        {
+            if ( Cache.class.isAssignableFrom( field.getType() ) )
+            {
+                field.setAccessible( true );
+                cacheField = field;
+            }
+            else if ( Configuration.class.isAssignableFrom( field.getType() ) )
+            {
+                field.setAccessible( true );
+                config = (CompleteConfiguration<?, ?>) field.get( context.getTestInstance().get() );
+            }
+        }
+
+        if ( cacheField != null )
+        {
+            if ( config == null )
+            {
+                throw new IllegalStateException( "Define a Configuration field" );
+            }
+            cacheField.set( context.getTestInstance().get(), cacheManager.createCache( cacheField.getName(), config ) );
+        }
+    }
+
+    @Override
+    public void afterEach( ExtensionContext context )
+    {
+        if ( cacheManager != null )
+        {
+            cacheManager.close();
+        }
+        if ( cachingProvider != null )
+        {
+            cachingProvider.close();
+        }
+    }
+}
diff --git a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/InternalCacheRule.java b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/InternalCacheRule.java
deleted file mode 100644
index 023d692bc..000000000
--- a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/InternalCacheRule.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.commons.jcs3.jcache.extras;
-
-import java.lang.reflect.Field;
-
-import javax.cache.Cache;
-import javax.cache.CacheManager;
-import javax.cache.Caching;
-import javax.cache.configuration.CompleteConfiguration;
-import javax.cache.configuration.Configuration;
-import javax.cache.spi.CachingProvider;
-
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-// TODO: *if needed* define @CacheDeifnition instead of relying on field types
-public class InternalCacheRule implements TestRule
-{
-    private final Object test;
-
-    public InternalCacheRule(final Object test)
-    {
-        this.test = test;
-    }
-
-    @Override
-    public Statement apply(final Statement base, final Description description)
-    {
-        return new Statement()
-        {
-            @Override
-            public void evaluate() throws Throwable
-            {
-                try (CachingProvider provider = Caching.getCachingProvider();
-                        CacheManager manager = provider.getCacheManager())
-                {
-                    Field cache = null;
-                    CompleteConfiguration<?, ?> config = null;
-                    for (final Field f : test.getClass().getDeclaredFields())
-                    {
-                        if (Cache.class.isAssignableFrom(f.getType()))
-                        {
-                            f.setAccessible(true);
-                            cache = f;
-                        }
-                        else if (Configuration.class.isAssignableFrom(f.getType()))
-                        {
-                            f.setAccessible(true);
-                            config = (CompleteConfiguration<?, ?>) f.get(test);
-                        }
-                    }
-                    if (cache != null)
-                    {
-                        if (config == null)
-                        {
-                            throw new IllegalStateException("Define a Configuration field");
-                        }
-                        cache.set(test, manager.createCache(cache.getName(), config));
-                    }
-                    base.evaluate();
-                }
-            }
-        };
-    }
-}
diff --git a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/cdi/ExtraJCacheExtensionTest.java b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/cdi/ExtraJCacheExtensionTest.java
index 09e1ac61b..740720f57 100644
--- a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/cdi/ExtraJCacheExtensionTest.java
+++ b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/cdi/ExtraJCacheExtensionTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.commons.jcs3.jcache.extras.cdi;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import javax.cache.CacheManager;
 import javax.cache.spi.CachingProvider;
@@ -28,12 +28,12 @@
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.inject.OWBInjector;
 import org.apache.webbeans.spi.ContainerLifecycle;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-public class ExtraJCacheExtensionTest
+class ExtraJCacheExtensionTest
 {
     public static class BeanWithInjections {
         @Inject
@@ -56,8 +56,8 @@ public CachingProvider getProvider()
 
     private static ContainerLifecycle lifecycle;
 
-    @BeforeClass
-    public static void startContainer()
+    @BeforeAll
+    static void startContainer()
     {
         final WebBeansContext webBeansContext = WebBeansContext.currentInstance();
         lifecycle = webBeansContext.getService(ContainerLifecycle.class);
@@ -65,8 +65,8 @@ public static void startContainer()
         bm = webBeansContext.getBeanManagerImpl();
     }
 
-    @AfterClass
-    public static void stopContainer()
+    @AfterAll
+    static void stopContainer()
     {
         lifecycle.stopApplication(null);
     }
@@ -74,20 +74,21 @@ public static void stopContainer()
     @Inject
     private BeanWithInjections bean;
 
-    @Before
-    public void inject() throws Exception
+    @BeforeEach
+    void inject()
+        throws Exception
     {
         OWBInjector.inject(bm, this, bm.createCreationalContext(null));
     }
 
     @Test
-    public void testDefaultCacheManager()
+    void testDefaultCacheManager()
     {
         assertNotNull(bean.getMgr());
     }
 
     @Test
-    public void testDefaultCacheProvider()
+    void testDefaultCacheProvider()
     {
         assertNotNull(bean.getProvider());
     }
diff --git a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CacheLoaderAdapterTest.java b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CacheLoaderAdapterTest.java
index a42444809..c3993e3cf 100644
--- a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CacheLoaderAdapterTest.java
+++ b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CacheLoaderAdapterTest.java
@@ -19,8 +19,8 @@
 package org.apache.commons.jcs3.jcache.extras.loader;
 
 import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.util.HashSet;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -30,15 +30,13 @@
 import javax.cache.configuration.MutableConfiguration;
 import javax.cache.integration.CacheLoaderException;
 
-import org.apache.commons.jcs3.jcache.extras.InternalCacheRule;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.commons.jcs3.jcache.extras.InternalCacheExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+@ExtendWith(InternalCacheExtension.class)
 public class CacheLoaderAdapterTest
 {
-    @Rule
-    public final InternalCacheRule rule = new InternalCacheRule(this);
-
     private final AtomicInteger count = new AtomicInteger();
     private final Configuration<?, ?> config = new MutableConfiguration<String, String>().setStoreByValue(false).setReadThrough(true).setCacheLoaderFactory(new CacheLoaderAdapter<String, String>()
     {
@@ -54,7 +52,7 @@ public String load(final String key) throws CacheLoaderException
     private Cache<String, String> cache;
 
     @Test
-    public void testCheckLoadAll()
+    void testCheckLoadAll()
     {
         assertFalse(cache.iterator().hasNext());
         assertEquals("foo", cache.get("foo"));
diff --git a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CompositeCacheLoaderTest.java b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CompositeCacheLoaderTest.java
index e8855bb20..7d6ec1d63 100644
--- a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CompositeCacheLoaderTest.java
+++ b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CompositeCacheLoaderTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.commons.jcs3.jcache.extras.loader;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -27,15 +27,13 @@
 import javax.cache.configuration.MutableConfiguration;
 import javax.cache.integration.CacheLoaderException;
 
-import org.apache.commons.jcs3.jcache.extras.InternalCacheRule;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.commons.jcs3.jcache.extras.InternalCacheExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+@ExtendWith(InternalCacheExtension.class)
 public class CompositeCacheLoaderTest
 {
-    @Rule
-    public final InternalCacheRule rule = new InternalCacheRule(this);
-
     private final AtomicInteger count = new AtomicInteger();
 
     private final CacheLoaderAdapter<String, String> loader1 = new CacheLoaderAdapter<>()
@@ -67,7 +65,7 @@ public String load(final String key) throws CacheLoaderException
     private Cache<String, String> cache;
 
     @Test
-    public void testCheckComposite()
+    void testCheckComposite()
     {
         cache.get("foo");
         assertEquals(2, count.get());
diff --git a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/web/JCacheFilterTest.java b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/web/JCacheFilterTest.java
index c47d68534..749c2bcc3 100644
--- a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/web/JCacheFilterTest.java
+++ b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/web/JCacheFilterTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.commons.jcs3.jcache.extras.web;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -39,10 +39,10 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.tomcat.util.descriptor.web.FilterDef;
 import org.apache.tomcat.util.descriptor.web.FilterMap;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-public class JCacheFilterTest
+class JCacheFilterTest
 {
     public static class Empty extends HttpServlet {
         private static final long serialVersionUID = 4131092201964167043L;
@@ -68,8 +68,9 @@ protected void service(final HttpServletRequest req, final HttpServletResponse r
 
     private static File docBase;
 
-    @BeforeClass
-    public static void createEmptyDir() {
+    @BeforeAll
+    static void createEmptyDir()
+    {
         docBase = new File("target/missing/");
         docBase.mkdirs();
         docBase.deleteOnExit();
@@ -95,7 +96,8 @@ private void stop(final Tomcat tomcat) throws LifecycleException {
     }
 
     @Test
-    public void testFilter() throws Exception
+    void testFilter()
+        throws Exception
     {
         Hello.COUNTER.set(0);
         final Tomcat tomcat = new Tomcat();
@@ -121,7 +123,8 @@ public void testFilter() throws Exception
     }
 
     @Test
-    public void testFilterNoOutput() throws Exception
+    void testFilterNoOutput()
+        throws Exception
     {
         Empty.COUNTER.set(0);
         final Tomcat tomcat = new Tomcat();
diff --git a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/writer/CacheWriterAdapterTest.java b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/writer/CacheWriterAdapterTest.java
index 31a473262..14b6d8e2b 100644
--- a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/writer/CacheWriterAdapterTest.java
+++ b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/writer/CacheWriterAdapterTest.java
@@ -19,9 +19,9 @@
 package org.apache.commons.jcs3.jcache.extras.writer;
 
 import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -32,15 +32,13 @@
 import javax.cache.configuration.MutableConfiguration;
 import javax.cache.integration.CacheWriterException;
 
-import org.apache.commons.jcs3.jcache.extras.InternalCacheRule;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.commons.jcs3.jcache.extras.InternalCacheExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+@ExtendWith(InternalCacheExtension.class)
 public class CacheWriterAdapterTest
 {
-    @Rule
-    public final InternalCacheRule rule = new InternalCacheRule(this);
-
     private final Map<String, String> copy = new HashMap<>();
     private final Configuration<?, ?> config = new MutableConfiguration<String, String>()
             .setStoreByValue(false).setReadThrough(true)
@@ -63,7 +61,7 @@ public void write(final Cache.Entry<? extends String, ? extends String> entry) t
     private Cache<String, String> cache;
 
     @Test
-    public void testCheckWriteAllAndDeleteAll()
+    void testCheckWriteAllAndDeleteAll()
     {
         assertTrue(copy.isEmpty());
         assertFalse(cache.iterator().hasNext());
diff --git a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/writer/CompositeCacheWriterTest.java b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/writer/CompositeCacheWriterTest.java
index f17d11edf..d46b58519 100644
--- a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/writer/CompositeCacheWriterTest.java
+++ b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/writer/CompositeCacheWriterTest.java
@@ -18,8 +18,8 @@
  */
 package org.apache.commons.jcs3.jcache.extras.writer;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,15 +29,13 @@
 import javax.cache.configuration.MutableConfiguration;
 import javax.cache.integration.CacheWriterException;
 
-import org.apache.commons.jcs3.jcache.extras.InternalCacheRule;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.commons.jcs3.jcache.extras.InternalCacheExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+@ExtendWith(InternalCacheExtension.class)
 public class CompositeCacheWriterTest
 {
-    @Rule
-    public final InternalCacheRule rule = new InternalCacheRule(this);
-
     private final Map<String, String> copy1 = new HashMap<>();
     private final Map<String, String> copy2 = new HashMap<>();
 
@@ -80,7 +78,7 @@ public void write(final Cache.Entry<? extends String, ? extends String> entry) t
     private Cache<String, String> cache;
 
     @Test
-    public void testCheckComposite()
+    void testCheckComposite()
     {
         cache.put("a", "b");
         assertEquals("b", copy1.get("a"));
diff --git a/commons-jcs3-jcache-openjpa/pom.xml b/commons-jcs3-jcache-openjpa/pom.xml
index df5d3306b..7c4c25655 100644
--- a/commons-jcs3-jcache-openjpa/pom.xml
+++ b/commons-jcs3-jcache-openjpa/pom.xml
@@ -61,11 +61,6 @@
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derbytools</artifactId>
diff --git a/commons-jcs3-jcache-openjpa/src/test/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCacheTest.java b/commons-jcs3-jcache-openjpa/src/test/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCacheTest.java
index 668b7eb7a..8d6fc167c 100644
--- a/commons-jcs3-jcache-openjpa/src/test/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCacheTest.java
+++ b/commons-jcs3-jcache-openjpa/src/test/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCacheTest.java
@@ -20,9 +20,9 @@
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Map;
 import java.util.Properties;
@@ -40,9 +40,9 @@
 import org.apache.openjpa.datacache.QueryKey;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class OpenJPAJCacheDataCacheTest
+class OpenJPAJCacheDataCacheTest
 {
     @Entity
     public static class MyEntity
@@ -85,7 +85,7 @@ public void setName(final String name)
     }};
 
     @Test
-    public void testEntity()
+    void testEntity()
     {
         final EntityManagerFactory emf = Persistence.createEntityManagerFactory("test-jcache", props);
         final OpenJPAConfiguration conf = OpenJPAEntityManagerFactorySPI.class.cast(emf).getConfiguration();
@@ -108,7 +108,7 @@ public void testEntity()
     }
 
     @Test
-    public void testQuery()
+    void testQuery()
     {
         final EntityManagerFactory emf = Persistence.createEntityManagerFactory("test-jcache", props);
         final OpenJPAConfiguration conf = OpenJPAEntityManagerFactorySPI.class.cast(emf).getConfiguration();
diff --git a/commons-jcs3-jcache-tck/pom.xml b/commons-jcs3-jcache-tck/pom.xml
index af37e263b..b3b93955c 100644
--- a/commons-jcs3-jcache-tck/pom.xml
+++ b/commons-jcs3-jcache-tck/pom.xml
@@ -81,11 +81,6 @@
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
 
     <dependency>
       <groupId>javax.cache</groupId>
diff --git a/commons-jcs3-jcache-tck/src/test/java/org/apache/commons/jcs3/jcache/EnsureCDIIsTestedWhenTCKsRunTest.java b/commons-jcs3-jcache-tck/src/test/java/org/apache/commons/jcs3/jcache/EnsureCDIIsTestedWhenTCKsRunTest.java
index 98c7cc87e..3c3f52459 100644
--- a/commons-jcs3-jcache-tck/src/test/java/org/apache/commons/jcs3/jcache/EnsureCDIIsTestedWhenTCKsRunTest.java
+++ b/commons-jcs3-jcache-tck/src/test/java/org/apache/commons/jcs3/jcache/EnsureCDIIsTestedWhenTCKsRunTest.java
@@ -20,21 +20,21 @@
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Iterator;
 import java.util.ServiceLoader;
 
 import javax.cache.annotation.BeanProvider;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 // useless test but without it we are not sure
 // CDI TCKs passed
-public class EnsureCDIIsTestedWhenTCKsRunTest
+class EnsureCDIIsTestedWhenTCKsRunTest
 {
     @Test
-    public void testCheckOWBProvider()
+    void testCheckOWBProvider()
     {
         try {
             final Iterator<BeanProvider> iterator = ServiceLoader.load(BeanProvider.class).iterator();
diff --git a/commons-jcs3-jcache/pom.xml b/commons-jcs3-jcache/pom.xml
index 124735a68..c98996fd6 100644
--- a/commons-jcs3-jcache/pom.xml
+++ b/commons-jcs3-jcache/pom.xml
@@ -63,11 +63,6 @@
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>
@@ -117,7 +112,7 @@
       </plugin>
     </plugins>
   </build>
-  
+
   <properties>
     <commons.module.name>org.apache.commons.jcs3.jcache</commons.module.name>
     <project.build.outputTimestamp>2022-01-01T00:00:00Z</project.build.outputTimestamp>
diff --git a/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/CacheTest.java b/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/CacheTest.java
index 112af8599..cb3c05b03 100644
--- a/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/CacheTest.java
+++ b/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/CacheTest.java
@@ -1,8 +1,27 @@
 package org.apache.commons.jcs3.jcache;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -29,31 +48,13 @@
 import javax.cache.integration.CacheWriter;
 import javax.cache.spi.CachingProvider;
 
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class CacheTest
+class CacheTest
 {
     @Test
-    public void testAccessExpiry() throws InterruptedException
+    void testAccessExpiry()
+        throws InterruptedException
     {
         final CachingProvider cachingProvider = Caching.getCachingProvider();
         final CacheManager cacheManager = cachingProvider.getCacheManager(cachingProvider.getDefaultURI(),
@@ -76,7 +77,7 @@ public void testAccessExpiry() throws InterruptedException
             cache.put(1, 2);
             for (int i = 0; i < 3; i++) { // we update the last access to force the idle time and lastaccess to be synced
                 Thread.sleep(250);
-                assertTrue("iteration: " + Integer.toString(i), cache.containsKey(1));
+                assertTrue( cache.containsKey( 1 ), "iteration: " + Integer.toString( i ) );
             }
             assertTrue(cache.containsKey(1));
             Thread.sleep(650);
@@ -88,7 +89,7 @@ public void testAccessExpiry() throws InterruptedException
     }
 
     @Test
-    public void testGetPut()
+    void testGetPut()
     {
         final CachingProvider cachingProvider = Caching.getCachingProvider();
         final CacheManager cacheManager = cachingProvider.getCacheManager();
@@ -103,7 +104,7 @@ public void testGetPut()
     }
 
     @Test
-    public void testListeners()
+    void testListeners()
     {
         final CachingProvider cachingProvider = Caching.getCachingProvider();
         final CacheManager cacheManager = cachingProvider.getCacheManager();
@@ -217,7 +218,7 @@ public boolean isSynchronous()
     }
 
     @Test
-    public void testLoader()
+    void testLoader()
     {
         final CachingProvider cachingProvider = Caching.getCachingProvider();
         final CacheManager cacheManager = cachingProvider.getCacheManager();
diff --git a/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/CachingProviderTest.java b/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/CachingProviderTest.java
index 65ab14122..792b3b407 100644
--- a/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/CachingProviderTest.java
+++ b/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/CachingProviderTest.java
@@ -1,10 +1,5 @@
 package org.apache.commons.jcs3.jcache;
 
-import static org.junit.Assert.assertNotNull;
-
-import javax.cache.Caching;
-import javax.cache.spi.CachingProvider;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -24,12 +19,17 @@
  * under the License.
  */
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import javax.cache.Caching;
+import javax.cache.spi.CachingProvider;
+
+import org.junit.jupiter.api.Test;
 
-public class CachingProviderTest
+class CachingProviderTest
 {
     @Test
-    public void testCreateCacheMgr()
+    void testCreateCacheMgr()
     {
         final CachingProvider cachingProvider = Caching.getCachingProvider();
         assertNotNull(cachingProvider.getCacheManager());
@@ -37,7 +37,7 @@ public void testCreateCacheMgr()
     }
 
     @Test
-    public void testFindProvider()
+    void testFindProvider()
     {
         assertNotNull(Caching.getCachingProvider());
     }
diff --git a/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/ExpiryListenerTest.java b/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/ExpiryListenerTest.java
index b8c9fac97..234139da8 100644
--- a/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/ExpiryListenerTest.java
+++ b/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/ExpiryListenerTest.java
@@ -19,8 +19,8 @@
 
 package org.apache.commons.jcs3.jcache;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -40,9 +40,10 @@
 import javax.cache.expiry.Duration;
 import javax.cache.spi.CachingProvider;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ExpiryListenerTest {
+class ExpiryListenerTest
+{
 
     private static final class CacheEntryExpiredListenerImpl implements CacheEntryExpiredListener<String, String>, Serializable {
         /**
@@ -61,7 +62,9 @@ public void onExpired(final Iterable<CacheEntryEvent<? extends String, ? extends
     }
 
     @Test
-    public void testListener() throws InterruptedException {
+    void testListener()
+        throws InterruptedException
+    {
         final CachingProvider cachingProvider = Caching.getCachingProvider();
         final CacheManager cacheManager = cachingProvider.getCacheManager();
         final CacheEntryExpiredListenerImpl listener = new CacheEntryExpiredListenerImpl();
diff --git a/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/ImmediateExpiryTest.java b/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/ImmediateExpiryTest.java
index ca931462d..1a953809c 100644
--- a/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/ImmediateExpiryTest.java
+++ b/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/ImmediateExpiryTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.commons.jcs3.jcache;
 
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import javax.cache.Cache;
 import javax.cache.CacheManager;
@@ -30,12 +30,12 @@
 import javax.cache.expiry.Duration;
 import javax.cache.spi.CachingProvider;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class ImmediateExpiryTest
+class ImmediateExpiryTest
 {
     @Test
-    public void testImmediate()
+    void testImmediate()
     {
         final CachingProvider cachingProvider = Caching.getCachingProvider();
         final CacheManager cacheManager = cachingProvider.getCacheManager();
diff --git a/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/NotSerializableTest.java b/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/NotSerializableTest.java
index 7e36dad6c..65ae75be6 100644
--- a/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/NotSerializableTest.java
+++ b/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/NotSerializableTest.java
@@ -18,9 +18,9 @@
  */
 package org.apache.commons.jcs3.jcache;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import javax.cache.Cache;
 import javax.cache.CacheManager;
@@ -28,9 +28,9 @@
 import javax.cache.configuration.MutableConfiguration;
 import javax.cache.spi.CachingProvider;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class NotSerializableTest
+class NotSerializableTest
 {
     public static class NotSerializableAndImHappyWithIt {
         private final String name;
@@ -42,7 +42,7 @@ public NotSerializableAndImHappyWithIt(final String name)
     }
 
     @Test
-    public void testRun()
+    void testRun()
     {
         final CachingProvider cachingProvider = Caching.getCachingProvider();
         final CacheManager cacheManager = cachingProvider.getCacheManager();
diff --git a/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelperTest.java b/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelperTest.java
index d6314553b..dd6c74bde 100644
--- a/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelperTest.java
+++ b/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelperTest.java
@@ -1,8 +1,5 @@
 package org.apache.commons.jcs3.jcache.cdi;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,6 +19,9 @@
  * under the License.
  */
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -31,9 +31,9 @@
 import javax.cache.annotation.CacheResult;
 import javax.interceptor.InvocationContext;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class CDIJCacheHelperTest
+class CDIJCacheHelperTest
 {
     @CacheDefaults(cacheName = "child")
     public interface MyChild1 extends MyParent
@@ -110,7 +110,7 @@ public void setParameters(final Object[] objects)
     }
 
     @Test
-    public void testProxyCacheDefaults()
+    void testProxyCacheDefaults()
     {
         final CDIJCacheHelper helper = new CDIJCacheHelper();
 
diff --git a/commons-jcs3-sandbox/commons-jcs3-filecache/pom.xml b/commons-jcs3-sandbox/commons-jcs3-filecache/pom.xml
index 023dbdb42..cabdfb17e 100644
--- a/commons-jcs3-sandbox/commons-jcs3-filecache/pom.xml
+++ b/commons-jcs3-sandbox/commons-jcs3-filecache/pom.xml
@@ -47,11 +47,6 @@
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 
diff --git a/commons-jcs3-sandbox/commons-jcs3-yajcache/pom.xml b/commons-jcs3-sandbox/commons-jcs3-yajcache/pom.xml
index 0485b57b5..44cdb256a 100644
--- a/commons-jcs3-sandbox/commons-jcs3-yajcache/pom.xml
+++ b/commons-jcs3-sandbox/commons-jcs3-yajcache/pom.xml
@@ -57,11 +57,6 @@
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index eef255942..941b23bdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -275,7 +275,7 @@
             </configuration>
           </execution>
         </executions>
-      </plugin>      
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
@@ -345,12 +345,6 @@
         <version>${commons.junit.version}</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.junit.vintage</groupId>
-        <artifactId>junit-vintage-engine</artifactId>
-        <version>${commons.junit.version}</version>
-        <scope>test</scope>
-      </dependency>
       <!-- Exclude for now -->
       <!-- dependency>
         <groupId>org.jgroups</groupId>
@@ -567,7 +561,7 @@
     <test.type>Unit</test.type>
     <doclint>none</doclint>
     <hamcrest.version>3.0</hamcrest.version>
-    
+
     <project.build.outputTimestamp>2022-01-01T00:00:00Z</project.build.outputTimestamp>
   </properties>