diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtil.java
index 84c992eed6f4..365855bbd3cf 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtil.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtil.java
@@ -17,9 +17,9 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.io.Closeable;
@@ -2013,11 +2013,11 @@ public void verifyNumericRows(Table table, final byte[] f, int startRow, int end
       get.setReplicaId(replicaId);
       get.setConsistency(Consistency.TIMELINE);
       Result result = table.get(get);
-      assertTrue(failMsg, result.containsColumn(f, null));
-      assertEquals(failMsg, 1, result.getColumnCells(f, null).size());
+      assertTrue(result.containsColumn(f, null), failMsg);
+      assertEquals(1, result.getColumnCells(f, null).size(), failMsg);
       Cell cell = result.getColumnLatestCell(f, null);
-      assertTrue(failMsg, Bytes.equals(data, 0, data.length, cell.getValueArray(),
-        cell.getValueOffset(), cell.getValueLength()));
+      assertTrue(Bytes.equals(data, 0, data.length, cell.getValueArray(), cell.getValueOffset(),
+        cell.getValueLength()), failMsg);
     }
   }
 
@@ -2044,14 +2044,14 @@ public void verifyNumericRows(HRegion region, final byte[] f, int startRow, int
       Result result = region.get(new Get(data));
 
       boolean hasResult = result != null && !result.isEmpty();
-      assertEquals(failMsg + result, present, hasResult);
+      assertEquals(present, hasResult, failMsg + result);
       if (!present) continue;
 
-      assertTrue(failMsg, result.containsColumn(f, null));
-      assertEquals(failMsg, 1, result.getColumnCells(f, null).size());
+      assertTrue(result.containsColumn(f, null), failMsg);
+      assertEquals(1, result.getColumnCells(f, null).size(), failMsg);
       Cell cell = result.getColumnLatestCell(f, null);
-      assertTrue(failMsg, Bytes.equals(data, 0, data.length, cell.getValueArray(),
-        cell.getValueOffset(), cell.getValueLength()));
+      assertTrue(Bytes.equals(data, 0, data.length, cell.getValueArray(), cell.getValueOffset(),
+        cell.getValueLength()), failMsg);
     }
   }
 
@@ -3408,8 +3408,8 @@ public void assertRegionOnlyOnServer(final RegionInfo hri, final ServerName serv
           }
           Collection<HRegion> hrs = rs.getOnlineRegionsLocalContext();
           for (HRegion r : hrs) {
-            assertTrue("Region should not be double assigned",
-              r.getRegionInfo().getRegionId() != hri.getRegionId());
+            assertTrue(r.getRegionInfo().getRegionId() != hri.getRegionId(),
+              "Region should not be double assigned");
           }
         }
         return; // good, we are happy
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCacheEviction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCacheEviction.java
index dd74f5e6f5b0..9ba13f3ab663 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCacheEviction.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCacheEviction.java
@@ -23,7 +23,7 @@
 import static org.apache.hadoop.hbase.io.hfile.CacheConfig.EVICT_BLOCKS_ON_CLOSE_KEY;
 import static org.apache.hadoop.hbase.io.hfile.CacheConfig.EVICT_BLOCKS_ON_SPLIT_KEY;
 import static org.apache.hadoop.hbase.io.hfile.CacheConfig.PREFETCH_BLOCKS_ON_OPEN_KEY;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -42,26 +42,18 @@
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Pair;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Category({ MiscTests.class, LargeTests.class })
-public class TestCacheEviction {
-
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestCacheEviction.class);
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
-  private static final Logger LOG = LoggerFactory.getLogger(TestCacheEviction.class);
+@Tag(MiscTests.TAG)
+@Tag(LargeTests.TAG)
+public class TestCacheEviction {
 
   private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() throws Exception {
     UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_META_OPERATION_TIMEOUT, 1000);
     UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 2);
@@ -71,7 +63,7 @@ public static void setUp() throws Exception {
     UTIL.getConfiguration().set(StoreFileTrackerFactory.TRACKER_IMPL, "FILE");
   }
 
-  @Before
+  @BeforeEach
   public void testSetup() {
     UTIL.getConfiguration().set(BUCKET_CACHE_IOENGINE_KEY,
       "file:" + UTIL.getDataTestDir() + "/bucketcache");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCachedClusterId.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCachedClusterId.java
index 88de0e43a200..03f8b090aae2 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCachedClusterId.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCachedClusterId.java
@@ -17,7 +17,7 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.MultithreadedTestUtil.TestContext;
@@ -25,17 +25,15 @@
 import org.apache.hadoop.hbase.master.CachedClusterId;
 import org.apache.hadoop.hbase.master.HMaster;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
-@Category(MediumTests.class)
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestCachedClusterId {
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestCachedClusterId.class);
 
   private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
 
@@ -57,7 +55,7 @@ public void doWork() throws Exception {
     }
   }
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() throws Exception {
     TEST_UTIL.startMiniCluster(1);
     activeMaster = TEST_UTIL.getHBaseCluster().getMaster();
@@ -65,7 +63,7 @@ public static void setUp() throws Exception {
     standByMaster = TEST_UTIL.getHBaseCluster().startMaster().getMaster();
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() throws Exception {
     TEST_UTIL.shutdownMiniCluster();
   }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCheckTestClasses.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCheckTestClasses.java
index c2b007280b4f..961bc83763f7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCheckTestClasses.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCheckTestClasses.java
@@ -28,7 +28,10 @@
 
 /**
  * Checks tests are categorized.
+ * <p>
+ * @deprecated Will be removed after we fully upgrade to junit5, so keep it as is.
  */
+@Deprecated
 @Category({ MiscTests.class, SmallTests.class })
 public class TestCheckTestClasses {
 
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterStatus.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterStatus.java
index 273bd3aef1cb..590d1889d56b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterStatus.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterStatus.java
@@ -17,6 +17,10 @@
  */
 package org.apache.hadoop.hbase;
 
+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.IOException;
 import java.util.EnumSet;
 import java.util.List;
@@ -34,25 +38,21 @@
 import org.apache.hadoop.hbase.master.HMaster;
 import org.apache.hadoop.hbase.regionserver.HRegionServer;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread;
 import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test the ClusterStatus.
  */
-@Category(MediumTests.class)
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestClientClusterStatus {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestClientClusterStatus.class);
-
   private static HBaseTestingUtil UTIL;
   private static Admin ADMIN;
   private final static int SLAVES = 5;
@@ -60,7 +60,7 @@ public class TestClientClusterStatus {
   private static SingleProcessHBaseCluster CLUSTER;
   private static HRegionServer DEAD;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpBeforeClass() throws Exception {
     Configuration conf = HBaseConfiguration.create();
     conf.set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, MyObserver.class.getName());
@@ -87,8 +87,7 @@ public void testNone() throws Exception {
     ClusterMetrics status1 = ADMIN.getClusterMetrics(EnumSet.noneOf(Option.class));
     // Do a rough compare. More specific compares can fail because all regions not deployed yet
     // or more requests than expected.
-    Assert.assertEquals(status0.getLiveServerMetrics().size(),
-      status1.getLiveServerMetrics().size());
+    assertEquals(status0.getLiveServerMetrics().size(), status1.getLiveServerMetrics().size());
   }
 
   @Test
@@ -108,7 +107,7 @@ public void testLiveAndDeadServersStatus() throws Exception {
       @Override
       public boolean evaluate() throws Exception {
         ClusterMetrics status = ADMIN.getClusterMetrics(EnumSet.of(Option.LIVE_SERVERS));
-        Assert.assertNotNull(status);
+        assertNotNull(status);
         return status.getRegionCount() > 0;
       }
     });
@@ -116,21 +115,21 @@ public boolean evaluate() throws Exception {
     EnumSet<Option> options =
       EnumSet.of(Option.LIVE_SERVERS, Option.DEAD_SERVERS, Option.SERVERS_NAME);
     ClusterMetrics status = ADMIN.getClusterMetrics(options);
-    Assert.assertNotNull(status);
-    Assert.assertNotNull(status.getLiveServerMetrics().keySet());
+    assertNotNull(status);
+    assertNotNull(status.getLiveServerMetrics().keySet());
     // exclude a dead region server
-    Assert.assertEquals(SLAVES - 1, numRs);
+    assertEquals(SLAVES - 1, numRs);
     // live servers = nums of regionservers
     // By default, HMaster don't carry any regions so it won't report its load.
     // Hence, it won't be in the server list.
-    Assert.assertEquals(status.getLiveServerMetrics().keySet().size(), numRs);
-    Assert.assertTrue(status.getRegionCount() > 0);
-    Assert.assertNotNull(status.getDeadServerNames());
-    Assert.assertEquals(1, status.getDeadServerNames().size());
+    assertEquals(status.getLiveServerMetrics().keySet().size(), numRs);
+    assertTrue(status.getRegionCount() > 0);
+    assertNotNull(status.getDeadServerNames());
+    assertEquals(1, status.getDeadServerNames().size());
     ServerName deadServerName = status.getDeadServerNames().iterator().next();
-    Assert.assertEquals(DEAD.getServerName(), deadServerName);
-    Assert.assertNotNull(status.getServersName());
-    Assert.assertEquals(numRs, status.getServersName().size());
+    assertEquals(DEAD.getServerName(), deadServerName);
+    assertNotNull(status.getServersName());
+    assertEquals(numRs, status.getServersName().size());
   }
 
   @Test
@@ -149,14 +148,14 @@ public void testMasterAndBackupMastersStatus() throws Exception {
         activeName = active.getServerName();
       }
     }
-    Assert.assertNotNull(active);
-    Assert.assertEquals(1, numActive);
-    Assert.assertEquals(MASTERS, masterThreads.size());
+    assertNotNull(active);
+    assertEquals(1, numActive);
+    assertEquals(MASTERS, masterThreads.size());
     // Retrieve master and backup masters infos only.
     EnumSet<Option> options = EnumSet.of(Option.MASTER, Option.BACKUP_MASTERS);
     ClusterMetrics status = ADMIN.getClusterMetrics(options);
-    Assert.assertTrue(status.getMasterName().equals(activeName));
-    Assert.assertEquals(MASTERS - 1, status.getBackupMasterNames().size());
+    assertTrue(status.getMasterName().equals(activeName));
+    assertEquals(MASTERS - 1, status.getBackupMasterNames().size());
   }
 
   @Test
@@ -164,14 +163,14 @@ public void testOtherStatusInfos() throws Exception {
     EnumSet<Option> options = EnumSet.of(Option.MASTER_COPROCESSORS, Option.HBASE_VERSION,
       Option.CLUSTER_ID, Option.BALANCER_ON);
     ClusterMetrics status = ADMIN.getClusterMetrics(options);
-    Assert.assertTrue(status.getMasterCoprocessorNames().size() == 1);
-    Assert.assertNotNull(status.getHBaseVersion());
-    Assert.assertNotNull(status.getClusterId());
-    Assert.assertTrue(status.getAverageLoad() == 0.0);
-    Assert.assertNotNull(status.getBalancerOn());
+    assertTrue(status.getMasterCoprocessorNames().size() == 1);
+    assertNotNull(status.getHBaseVersion());
+    assertNotNull(status.getClusterId());
+    assertTrue(status.getAverageLoad() == 0.0);
+    assertNotNull(status.getBalancerOn());
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownAfterClass() throws Exception {
     if (ADMIN != null) ADMIN.close();
     UTIL.shutdownMiniCluster();
@@ -181,10 +180,10 @@ public static void tearDownAfterClass() throws Exception {
   public void testObserver() throws IOException {
     int preCount = MyObserver.PRE_COUNT.get();
     int postCount = MyObserver.POST_COUNT.get();
-    Assert.assertTrue(ADMIN.getClusterMetrics().getMasterCoprocessorNames().stream()
+    assertTrue(ADMIN.getClusterMetrics().getMasterCoprocessorNames().stream()
       .anyMatch(s -> s.equals(MyObserver.class.getSimpleName())));
-    Assert.assertEquals(preCount + 1, MyObserver.PRE_COUNT.get());
-    Assert.assertEquals(postCount + 1, MyObserver.POST_COUNT.get());
+    assertEquals(preCount + 1, MyObserver.PRE_COUNT.get());
+    assertEquals(postCount + 1, MyObserver.POST_COUNT.get());
   }
 
   public static class MyObserver implements MasterCoprocessor, MasterObserver {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
index d8aeaf68b699..2b07a2d3a3b2 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
@@ -19,7 +19,7 @@
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.net.SocketTimeoutException;
@@ -43,12 +43,11 @@
 import org.apache.hadoop.hbase.testclassification.ClientTests;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -71,15 +70,12 @@
  * specified for scan related operations such as openScanner(), next(). If that times out
  * {@link RetriesExhaustedException} will be thrown.
  */
-@Category({ ClientTests.class, MediumTests.class })
+@Tag(ClientTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestClientOperationTimeout {
 
   private static final Logger LOG = LoggerFactory.getLogger(TestClientOperationTimeout.class);
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestClientOperationTimeout.class);
-
   private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
 
   // Activate the delays after table creation to test get/scan/put
@@ -97,7 +93,7 @@ public class TestClientOperationTimeout {
   private static Connection CONN;
   private static Table TABLE;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() throws Exception {
     // Set RegionServer class and use default values for other options.
     StartTestingClusterOption option =
@@ -115,14 +111,14 @@ public static void setUp() throws Exception {
     TABLE = CONN.getTable(TABLE_NAME);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() throws Exception {
     Closeables.close(TABLE, true);
     Closeables.close(CONN, true);
     UTIL.shutdownMiniCluster();
   }
 
-  @Before
+  @BeforeEach
   public void setUpBeforeTest() throws Exception {
     DELAY_GET = 0;
     DELAY_SCAN = 0;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java
index cc49840baa9d..baac1c135349 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java
@@ -17,28 +17,24 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread;
 import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the boot order indifference between regionserver and master
  */
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestClusterBootOrder {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestClusterBootOrder.class);
-
   private static final long SLEEP_INTERVAL = 1000;
   private static final long SLEEP_TIME = 4000;
 
@@ -47,7 +43,7 @@ public class TestClusterBootOrder {
   private RegionServerThread rs;
   private MasterThread master;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     testUtil = new HBaseTestingUtil();
     testUtil.startMiniDFSCluster(1);
@@ -56,7 +52,7 @@ public void setUp() throws Exception {
     cluster = new LocalHBaseCluster(testUtil.getConfiguration(), 0, 0);
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     cluster.shutdown();
     cluster.join();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterPortAssignment.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterPortAssignment.java
index e3a9836c7f71..96aa4a9bc078 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterPortAssignment.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterPortAssignment.java
@@ -17,24 +17,22 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.net.BindException;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Category(MediumTests.class)
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestClusterPortAssignment {
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestClusterPortAssignment.class);
 
   private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
   private static final Logger LOG = LoggerFactory.getLogger(TestClusterPortAssignment.class);
@@ -42,7 +40,7 @@ public class TestClusterPortAssignment {
   /**
    * Check that we can start an HBase cluster specifying a custom set of RPC and infoserver ports.
    */
-  @Test(timeout = 300000)
+  @Test
   public void testClusterPortAssignment() throws Exception {
     boolean retry = false;
     do {
@@ -60,16 +58,17 @@ public void testClusterPortAssignment() throws Exception {
       LOG.info("Ports: {}, {}, {}, {}", masterPort, masterInfoPort, rsPort, rsInfoPort);
       try {
         SingleProcessHBaseCluster cluster = TEST_UTIL.startMiniCluster();
-        assertTrue("Cluster failed to come up", cluster.waitForActiveAndReadyMaster(30000));
+        assertTrue(cluster.waitForActiveAndReadyMaster(30000), "Cluster failed to come up");
         retry = false;
-        assertEquals("Master RPC port is incorrect", masterPort,
-          cluster.getMaster().getRpcServer().getListenerAddress().getPort());
-        assertEquals("Master info port is incorrect", masterInfoPort,
-          cluster.getMaster().getInfoServer().getPort());
-        assertEquals("RS RPC port is incorrect", rsPort,
-          cluster.getRegionServer(0).getRpcServer().getListenerAddress().getPort());
-        assertEquals("RS info port is incorrect", rsInfoPort,
-          cluster.getRegionServer(0).getInfoServer().getPort());
+        assertEquals(masterPort, cluster.getMaster().getRpcServer().getListenerAddress().getPort(),
+          "Master RPC port is incorrect");
+        assertEquals(masterInfoPort, cluster.getMaster().getInfoServer().getPort(),
+          "Master info port is incorrect");
+        assertEquals(rsPort,
+          cluster.getRegionServer(0).getRpcServer().getListenerAddress().getPort(),
+          "RS RPC port is incorrect");
+        assertEquals(rsInfoPort, cluster.getRegionServer(0).getInfoServer().getPort(),
+          "RS info port is incorrect");
       } catch (Exception e) {
         Throwable rootCause = ExceptionUtils.getRootCause(e);
         if (rootCause instanceof BindException) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestColumnFamilyDescriptorDefaultVersions.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestColumnFamilyDescriptorDefaultVersions.java
index 8ce5e88a3abb..be5be05ce0de 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestColumnFamilyDescriptorDefaultVersions.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestColumnFamilyDescriptorDefaultVersions.java
@@ -17,7 +17,7 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import org.apache.hadoop.fs.Path;
@@ -32,28 +32,21 @@
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.CommonFSUtils;
 import org.apache.hadoop.hbase.util.FSTableDescriptors;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 
 /**
  * Verify that the ColumnFamilyDescriptor version is set correctly by default, hbase-site.xml, and
  * user input
  */
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestColumnFamilyDescriptorDefaultVersions {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestColumnFamilyDescriptorDefaultVersions.class);
-
-  @Rule
-  public TestName name = new TestName();
   private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
   private static TableName TABLE_NAME = null;
   private static final byte[] FAMILY = Bytes.toBytes("cf0");
@@ -61,18 +54,18 @@ public class TestColumnFamilyDescriptorDefaultVersions {
   /**
    * Start up a mini cluster and put a small table of empty regions into it.
    */
-  @BeforeClass
+  @BeforeAll
   public static void beforeAllTests() throws Exception {
     TEST_UTIL.startMiniCluster(1);
   }
 
-  @Before
-  public void setup() {
-    TABLE_NAME = TableName.valueOf(name.getMethodName());
+  @BeforeEach
+  public void setup(TestInfo testInfo) {
+    TABLE_NAME = TableName.valueOf(testInfo.getTestMethod().get().getName());
 
   }
 
-  @AfterClass
+  @AfterAll
   public static void afterAllTests() throws Exception {
     TEST_UTIL.shutdownMiniCluster();
   }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCustomPriorityRpcControllerFactory.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCustomPriorityRpcControllerFactory.java
index 435037ab17d2..9a7d7464e51c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCustomPriorityRpcControllerFactory.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCustomPriorityRpcControllerFactory.java
@@ -17,7 +17,7 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -50,10 +50,9 @@
 import org.apache.hadoop.hbase.testclassification.ClientTests;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hbase.thirdparty.com.google.protobuf.RpcController;
 import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;
@@ -64,13 +63,10 @@
  * Tests that one can implement their own RpcControllerFactory and expect it to successfully pass
  * custom priority values to the server for all HTable calls.
  */
-@Category({ ClientTests.class, MediumTests.class })
+@Tag(ClientTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestCustomPriorityRpcControllerFactory {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestCustomPriorityRpcControllerFactory.class);
-
   private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
 
   private static final AtomicReference<State> STATE = new AtomicReference<>(State.SETUP);
@@ -93,7 +89,7 @@ private enum State {
   private static Connection CONN;
   private static Table TABLE;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpClass() throws Exception {
     // Set RegionServer class and use default values for other options.
     UTIL.startMiniCluster(
@@ -249,8 +245,8 @@ private void testForCall(ThrowingCallable callable) throws Exception {
     EXPECTED_PRIORITY.set(new Random().nextInt(MIN_CUSTOM_PRIORITY) + MIN_CUSTOM_PRIORITY);
     callable.call();
 
-    assertEquals("Expected state to change to SUCCESS. Check for assertion error in logs",
-      STATE.get(), State.SUCCESS);
+    assertEquals(State.SUCCESS, STATE.get(),
+      "Expected state to change to SUCCESS. Check for assertion error in logs");
   }
 
   private interface ThrowingCallable {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestExecutorStatusChore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestExecutorStatusChore.java
index 0b5c8d8631d0..8e11ff30a9bc 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestExecutorStatusChore.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestExecutorStatusChore.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.hbase;
 
-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 static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -26,7 +26,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.hadoop.hbase.executor.EventType;
 import org.apache.hadoop.hbase.executor.ExecutorService;
-import org.apache.hadoop.hbase.executor.ExecutorService.ExecutorConfig;
 import org.apache.hadoop.hbase.executor.ExecutorType;
 import org.apache.hadoop.hbase.executor.TestExecutorService.TestEventHandler;
 import org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource;
@@ -35,17 +34,14 @@
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Pair;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Category({ MiscTests.class, SmallTests.class })
+@Tag(MiscTests.TAG)
+@Tag(SmallTests.TAG)
 public class TestExecutorStatusChore {
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestExecutorStatusChore.class);
 
   private static final Logger LOG = LoggerFactory.getLogger(TestExecutorStatusChore.class);
 
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java
index c3097dce4dcc..d2791600a611 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.hbase;
 
-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.io.IOException;
 import org.apache.hadoop.fs.FileSystem;
@@ -28,57 +28,58 @@
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.FSTableDescriptors;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 
-@Category({ MiscTests.class, SmallTests.class })
+@Tag(MiscTests.TAG)
+@Tag(SmallTests.TAG)
 public class TestFSTableDescriptorForceCreation {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestFSTableDescriptorForceCreation.class);
-
   private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
 
-  @Rule
-  public TestName name = new TestName();
+  private String name;
+
+  @BeforeEach
+  public void setUp(TestInfo testInfo) {
+    name = testInfo.getTestMethod().get().getName();
+  }
 
   @Test
   public void testShouldCreateNewTableDescriptorIfForcefulCreationIsFalse() throws IOException {
-    final String name = this.name.getMethodName();
     FileSystem fs = FileSystem.get(UTIL.getConfiguration());
     Path rootdir = new Path(UTIL.getDataTestDir(), name);
-    FSTableDescriptors fstd = new FSTableDescriptors(fs, rootdir);
-
-    assertTrue("Should create new table descriptor", fstd.createTableDescriptor(
-      TableDescriptorBuilder.newBuilder(TableName.valueOf(name)).build(), false));
+    try (FSTableDescriptors fstd = new FSTableDescriptors(fs, rootdir)) {
+      assertTrue(
+        fstd.createTableDescriptor(
+          TableDescriptorBuilder.newBuilder(TableName.valueOf(name)).build(), false),
+        "Should create new table descriptor");
+    }
   }
 
   @Test
   public void testShouldNotCreateTheSameTableDescriptorIfForcefulCreationIsFalse()
     throws IOException {
-    final String name = this.name.getMethodName();
     FileSystem fs = FileSystem.get(UTIL.getConfiguration());
     // Cleanup old tests if any detritus laying around.
     Path rootdir = new Path(UTIL.getDataTestDir(), name);
-    FSTableDescriptors fstd = new FSTableDescriptors(fs, rootdir);
-    TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(name)).build();
-    fstd.update(htd);
-    assertFalse("Should not create new table descriptor", fstd.createTableDescriptor(htd, false));
+    try (FSTableDescriptors fstd = new FSTableDescriptors(fs, rootdir)) {
+      TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(name)).build();
+      fstd.update(htd);
+      assertFalse(fstd.createTableDescriptor(htd, false), "Should not create new table descriptor");
+    }
   }
 
   @Test
   public void testShouldAllowForcefulCreationOfAlreadyExistingTableDescriptor() throws Exception {
-    final String name = this.name.getMethodName();
     FileSystem fs = FileSystem.get(UTIL.getConfiguration());
     Path rootdir = new Path(UTIL.getDataTestDir(), name);
-    FSTableDescriptors fstd = new FSTableDescriptors(fs, rootdir);
-    TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(name)).build();
-    fstd.createTableDescriptor(htd, false);
-    assertTrue("Should create new table descriptor", fstd.createTableDescriptor(htd, true));
+    try (FSTableDescriptors fstd = new FSTableDescriptors(fs, rootdir)) {
+      TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(name)).build();
+      fstd.createTableDescriptor(htd, false);
+      assertTrue(fstd.createTableDescriptor(htd, true), "Should create new table descriptor");
+    }
   }
 
 }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
index 99ce11637cfc..959ce740c650 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
@@ -17,7 +17,7 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.Waiter.ExplainingPredicate;
@@ -26,28 +26,24 @@
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestFullLogReconstruction {
   private static final Logger LOG = LoggerFactory.getLogger(TestFullLogReconstruction.class);
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestFullLogReconstruction.class);
-
   private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
 
   private final static TableName TABLE_NAME = TableName.valueOf("tabletest");
   private final static byte[] FAMILY = Bytes.toBytes("family");
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpBeforeClass() throws Exception {
     Configuration c = TEST_UTIL.getConfiguration();
     // quicker heartbeat interval for faster DN death notification
@@ -61,7 +57,7 @@ public static void setUpBeforeClass() throws Exception {
     TEST_UTIL.startMiniCluster(3);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownAfterClass() throws Exception {
     TEST_UTIL.shutdownMiniCluster();
   }
@@ -77,7 +73,7 @@ public void testReconstruction() throws Exception {
 
     // Load up the table with simple rows and count them
     int initialCount = TEST_UTIL.loadTable(table, FAMILY);
-    int count = TEST_UTIL.countRows(table);
+    int count = HBaseTestingUtil.countRows(table);
 
     assertEquals(initialCount, count);
 
@@ -104,7 +100,7 @@ public String explainFailure() throws Exception {
     });
     LOG.info("Starting count");
 
-    int newCount = TEST_UTIL.countRows(table);
+    int newCount = HBaseTestingUtil.countRows(table);
     assertEquals(count, newCount);
     table.close();
   }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
index 07ad497e5cc7..c347832d38fb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.hbase;
 
-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.IOException;
 import java.util.ArrayList;
@@ -35,11 +35,11 @@
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.apache.hadoop.hbase.util.JVMClusterUtil;
 import org.apache.hadoop.hbase.util.Threads;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,13 +49,10 @@
  * Test HBASE-3694 whether the GlobalMemStoreSize is the same as the summary of all the online
  * region's MemStoreSize
  */
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestGlobalMemStoreSize {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestGlobalMemStoreSize.class);
-
   private static final Logger LOG = LoggerFactory.getLogger(TestGlobalMemStoreSize.class);
   private static int regionServerNum = 4;
   private static int regionNum = 16;
@@ -65,15 +62,8 @@ public class TestGlobalMemStoreSize {
   private HBaseTestingUtil TEST_UTIL;
   private SingleProcessHBaseCluster cluster;
 
-  @Rule
-  public TestName name = new TestName();
-
-  /**
-   * Test the global mem store size in the region server is equal to sum of each region's mem store
-   * size
-   */
-  @Test
-  public void testGlobalMemStore() throws Exception {
+  @BeforeEach
+  public void setUp() throws Exception {
     // Start the cluster
     LOG.info("Starting cluster");
     Configuration conf = HBaseConfiguration.create();
@@ -82,9 +72,21 @@ public void testGlobalMemStore() throws Exception {
     cluster = TEST_UTIL.getHBaseCluster();
     LOG.info("Waiting for active/ready master");
     cluster.waitForActiveAndReadyMaster();
+  }
 
+  @AfterEach
+  public void tearDown() throws Exception {
+    TEST_UTIL.shutdownMiniCluster();
+  }
+
+  /**
+   * Test the global mem store size in the region server is equal to sum of each region's mem store
+   * size
+   */
+  @Test
+  public void testGlobalMemStore(TestInfo testInfo) throws Exception {
     // Create a table with regions
-    final TableName table = TableName.valueOf(name.getMethodName());
+    final TableName table = TableName.valueOf(testInfo.getTestMethod().get().getName());
     byte[] family = Bytes.toBytes("family");
     LOG.info("Creating table with " + regionNum + " regions");
     Table ht = TEST_UTIL.createMultiRegionTable(table, family, regionNum);
@@ -141,11 +143,10 @@ public void testGlobalMemStore() throws Exception {
         }
       }
       size = server.getRegionServerAccounting().getGlobalMemStoreDataSize();
-      assertEquals("Server=" + server.getServerName() + ", i=" + i++, 0, size);
+      assertEquals(0, size, "Server=" + server.getServerName() + ", i=" + i++);
     }
 
     ht.close();
-    TEST_UTIL.shutdownMiniCluster();
   }
 
   /**
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseMetaEdit.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseMetaEdit.java
index 2a438461b4e7..567e55e02c6a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseMetaEdit.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseMetaEdit.java
@@ -17,10 +17,10 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+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 static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -35,32 +35,26 @@
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test being able to edit hbase:meta.
  */
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestHBaseMetaEdit {
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestHBaseMetaEdit.class);
-  @Rule
-  public TestName name = new TestName();
+
   private final static HBaseTestingUtil UTIL = new HBaseTestingUtil();
 
-  @Before
+  @BeforeEach
   public void before() throws Exception {
     UTIL.startMiniCluster();
   }
 
-  @After
+  @AfterEach
   public void after() throws Exception {
     UTIL.shutdownMiniCluster();
   }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.java
index 31d3dd441dee..90ae49c04696 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.java
@@ -17,37 +17,30 @@
  */
 package org.apache.hadoop.hbase;
 
-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.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 
 /**
  * Test that an HBase cluster can run on top of an existing MiniDfsCluster
  */
-@Category(MediumTests.class)
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestHBaseOnOtherDfsCluster {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestHBaseOnOtherDfsCluster.class);
-
-  @Rule
-  public TestName name = new TestName();
-
   @Test
-  public void testOveralyOnOtherCluster() throws Exception {
+  public void testOveralyOnOtherCluster(TestInfo testInfo) throws Exception {
     // just run HDFS
     HBaseTestingUtil util1 = new HBaseTestingUtil();
     MiniDFSCluster dfs = util1.startMiniDFSCluster(1);
@@ -67,13 +60,13 @@ public void testOveralyOnOtherCluster() throws Exception {
     targetFs = FileSystem.get(util2.getConfiguration());
     assertFsSameUri(fs, targetFs);
 
-    Path randomFile = new Path("/" + util1.getRandomUUID());
+    Path randomFile = new Path("/" + HBaseTestingUtil.getRandomUUID());
     assertTrue(targetFs.createNewFile(randomFile));
     assertTrue(fs.exists(randomFile));
 
     // do a simple create/write to ensure the cluster works as expected
     byte[] family = Bytes.toBytes("testfamily");
-    final TableName tablename = TableName.valueOf(name.getMethodName());
+    final TableName tablename = TableName.valueOf(testInfo.getTestMethod().get().getName());
     Table table = util2.createTable(tablename, family);
     Put p = new Put(new byte[] { 1, 2, 3 });
     p.addColumn(family, null, new byte[] { 1 });
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtil.java
index dee082ab08fa..39ddadeedf5d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtil.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtil.java
@@ -17,10 +17,10 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-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.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.util.List;
@@ -39,31 +39,24 @@
 import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.security.ssl.SSLFactory;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Test our testing utility class
  */
-@Category({ MiscTests.class, LargeTests.class })
+@Tag(MiscTests.TAG)
+@Tag(LargeTests.TAG)
 public class TestHBaseTestingUtil {
-  private static final int NUMTABLES = 1;
-  private static final int NUMROWS = 100;
-  private static final int NUMREGIONS = 10;
-
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestHBaseTestingUtil.class);
 
   private static final Logger LOG = LoggerFactory.getLogger(TestHBaseTestingUtil.class);
 
-  @Rule
-  public TestName name = new TestName();
+  private static final int NUMTABLES = 1;
+  private static final int NUMROWS = 100;
+  private static final int NUMREGIONS = 10;
 
   /**
    * Basic sanity test that spins up multiple HDFS and HBase clusters that share the same ZK
@@ -72,7 +65,7 @@ public class TestHBaseTestingUtil {
    * @throws Exception on error
    */
   @Test
-  public void testMultiClusters() throws Exception {
+  public void testMultiClusters(TestInfo testInfo) throws Exception {
     // Create three clusters
 
     // Cluster 1.
@@ -102,7 +95,7 @@ public void testMultiClusters() throws Exception {
       htu2.startMiniCluster();
       htu3.startMiniCluster();
 
-      final TableName tableName = TableName.valueOf(name.getMethodName());
+      final TableName tableName = TableName.valueOf(testInfo.getTestMethod().get().getName());
       final byte[] FAM_NAME = Bytes.toBytes("fam");
       final byte[] ROW = Bytes.toBytes("row");
       final byte[] QUAL_NAME = Bytes.toBytes("qual");
@@ -452,8 +445,7 @@ public void testOverridingOfDefaultPorts() throws Exception {
   // This test demonstrates how long killHBTU takes vs. shutdownHBTU takes
   // for realistic results, adjust NUMROWS, NUMTABLES to much larger number.
   @Test
-  public void testKillMiniHBaseCluster() throws Exception {
-
+  public void testKillMiniHBaseCluster(TestInfo testInfo) throws Exception {
     HBaseTestingUtil htu = new HBaseTestingUtil();
     htu.startMiniZKCluster();
 
@@ -464,7 +456,7 @@ public void testKillMiniHBaseCluster() throws Exception {
       byte[] FAM_NAME;
 
       for (int i = 0; i < NUMTABLES; i++) {
-        tableName = TableName.valueOf(name.getMethodName() + i);
+        tableName = TableName.valueOf(testInfo.getTestMethod().get().getName() + i);
         FAM_NAME = Bytes.toBytes("fam" + i);
 
         try (Table table = htu.createMultiRegionTable(tableName, FAM_NAME, NUMREGIONS)) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHRegionLocation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHRegionLocation.java
index 2e7cc1d4315c..dae6378abe44 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHRegionLocation.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHRegionLocation.java
@@ -17,25 +17,21 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-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.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.hadoop.hbase.client.RegionInfoBuilder;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
-@Category({ MiscTests.class, SmallTests.class })
+@Tag(MiscTests.TAG)
+@Tag(SmallTests.TAG)
 public class TestHRegionLocation {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestHRegionLocation.class);
-
   /**
    * HRegionLocations are equal if they have the same 'location' -- i.e. host and port -- even if
    * they are carrying different regions. Verify that is indeed the case.
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java
index 820d49edd894..bcf8906300ec 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.hbase;
 
-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.IOException;
 import java.util.List;
@@ -50,9 +50,8 @@
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
 import org.apache.hadoop.hbase.wal.WAL;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -80,13 +79,10 @@
  * that has had some files removed because of a compaction. This sort of hurry's along and makes
  * certain what is a chance occurance.
  */
-@Category({ MiscTests.class, LargeTests.class })
+@Tag(MiscTests.TAG)
+@Tag(LargeTests.TAG)
 public class TestIOFencing {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestIOFencing.class);
-
   private static final Logger LOG = LoggerFactory.getLogger(TestIOFencing.class);
   static {
     // Uncomment the following lines if more verbosity is needed for
@@ -312,8 +308,8 @@ public void doTest(Class<?> regionClass, MemoryCompactionPolicy policy) throws E
           + compactingRegion.getRegionInfo().getRegionNameAsString());
         Thread.sleep(1000);
         admin.flush(table.getName());
-        assertTrue("Timed out waiting for the region to flush",
-          EnvironmentEdgeManager.currentTime() - startWaitTime < 30000);
+        assertTrue(EnvironmentEdgeManager.currentTime() - startWaitTime < 30000,
+          "Timed out waiting for the region to flush");
       }
       assertTrue(compactingRegion.countStoreFiles() > 1);
       final byte REGION_NAME[] = compactingRegion.getRegionInfo().getRegionName();
@@ -345,7 +341,7 @@ public boolean evaluate() throws Exception {
       // all the files we expect are still working when region is up in new location.
       FileSystem fs = newRegion.getFilesystem();
       for (String f : newRegion.getStoreFileList(new byte[][] { FAMILY })) {
-        assertTrue("After compaction, does not exist: " + f, fs.exists(new Path(f)));
+        assertTrue(fs.exists(new Path(f)), "After compaction, does not exist: " + f);
       }
       LOG.info("Allowing compaction to proceed");
       compactingRegion.allowCompactions();
@@ -364,8 +360,8 @@ public boolean evaluate() throws Exception {
       startWaitTime = EnvironmentEdgeManager.currentTime();
       while (newRegion.compactCount.get() == 0) {
         Thread.sleep(1000);
-        assertTrue("New region never compacted",
-          EnvironmentEdgeManager.currentTime() - startWaitTime < 180000);
+        assertTrue(EnvironmentEdgeManager.currentTime() - startWaitTime < 180000,
+          "New region never compacted");
       }
       int count;
       for (int i = 0;; i++) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java
index 01f957f7c525..a6278eabbcaf 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java
@@ -26,10 +26,9 @@
 import java.util.Locale;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,13 +41,10 @@
  * java.net.preferIPv4Stack=true, so that ZK will not fail to bind to ipv6 address using
  * ClientCnxnSocketNIO.
  */
-@Category({ MiscTests.class, SmallTests.class })
+@Tag(MiscTests.TAG)
+@Tag(SmallTests.TAG)
 public class TestIPv6NIOServerSocketChannel {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestIPv6NIOServerSocketChannel.class);
-
   private static final Logger LOG = LoggerFactory.getLogger(TestIPv6NIOServerSocketChannel.class);
 
   /**
@@ -120,8 +116,8 @@ public void testServerSocket() throws IOException {
       // On Windows JDK6, we will get expected exception:
       // java.net.SocketException: Address family not supported by protocol family
       // or java.net.SocketException: Protocol family not supported
-      Assert.assertFalse(ex instanceof BindException);
-      Assert.assertTrue(ex.getMessage().toLowerCase(Locale.ROOT).contains("protocol family"));
+      Assertions.assertFalse(ex instanceof BindException);
+      Assertions.assertTrue(ex.getMessage().toLowerCase(Locale.ROOT).contains("protocol family"));
       LOG.info("Received expected exception:", ex);
 
       // if this is the case, ensure that we are running on preferIPv4=true
@@ -136,7 +132,7 @@ public void ensurePreferIPv4() throws IOException {
     InetAddress[] addrs = InetAddress.getAllByName("localhost");
     for (InetAddress addr : addrs) {
       LOG.info("resolved localhost as:" + addr);
-      Assert.assertEquals(4, addr.getAddress().length); // ensure 4 byte ipv4 address
+      Assertions.assertEquals(4, addr.getAddress().length); // ensure 4 byte ipv4 address
     }
   }
 
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
index a894bbcd0aeb..1785471ae919 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
@@ -17,9 +17,9 @@
  */
 package org.apache.hadoop.hbase;
 
-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.io.IOException;
 import java.io.InputStream;
@@ -30,33 +30,25 @@
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Testing, info servers are disabled. This test enables then and checks that they serve pages.
  */
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestInfoServers {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestInfoServers.class);
-
   private static final Logger LOG = LoggerFactory.getLogger(TestInfoServers.class);
   private final static HBaseTestingUtil UTIL = new HBaseTestingUtil();
 
-  @Rule
-  public TestName name = new TestName();
-
-  @BeforeClass
+  @BeforeAll
   public static void beforeClass() throws Exception {
     // The info servers do not run in tests by default.
     // Set them to ephemeral ports so they will start
@@ -71,7 +63,7 @@ public static void beforeClass() throws Exception {
     }
   }
 
-  @AfterClass
+  @AfterAll
   public static void afterClass() throws Exception {
     UTIL.shutdownMiniCluster();
   }
@@ -116,8 +108,8 @@ public void testInfoServersStatusPages() throws Exception {
   }
 
   @Test
-  public void testMasterServerReadOnly() throws Exception {
-    final TableName tableName = TableName.valueOf(name.getMethodName());
+  public void testMasterServerReadOnly(TestInfo testInfo) throws Exception {
+    final TableName tableName = TableName.valueOf(testInfo.getTestMethod().get().getName());
     byte[] cf = Bytes.toBytes("d");
     UTIL.createTable(tableName, cf);
     UTIL.waitTableAvailable(tableName);
@@ -133,14 +125,14 @@ public void testMasterServerReadOnly() throws Exception {
   private void assertContainsContent(final URL u, final String expected) throws IOException {
     LOG.info("Testing " + u.toString() + " has " + expected);
     String content = getUrlContent(u);
-    assertTrue("expected=" + expected + ", content=" + content, content.contains(expected));
+    assertTrue(content.contains(expected), "expected=" + expected + ", content=" + content);
   }
 
   private void assertDoesNotContainContent(final URL u, final String expected) throws IOException {
     LOG.info("Testing " + u.toString() + " does not have " + expected);
     String content = getUrlContent(u);
-    assertFalse("Does Not Contain =" + expected + ", content=" + content,
-      content.contains(expected));
+    assertFalse(content.contains(expected),
+      "Does Not Contain =" + expected + ", content=" + content);
   }
 
   private String getUrlContent(URL u) throws IOException {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXConnectorServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXConnectorServer.java
index 7903fb12ee0d..68fbd798068f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXConnectorServer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXConnectorServer.java
@@ -31,27 +31,23 @@
 import org.apache.hadoop.hbase.security.access.AccessController;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Test case for JMX Connector Server.
  */
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestJMXConnectorServer {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestJMXConnectorServer.class);
-
   private static final Logger LOG = LoggerFactory.getLogger(TestJMXConnectorServer.class);
   private static HBaseTestingUtil UTIL = new HBaseTestingUtil();
 
@@ -62,7 +58,7 @@ public class TestJMXConnectorServer {
   // Switch for customized Accesscontroller to throw ACD exception while executing test case
   private volatile static boolean hasAccess;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpBeforeClass() throws Exception {
     conf = UTIL.getConfiguration();
     String cps = JMXListener.class.getName() + "," + MyAccessController.class.getName();
@@ -75,18 +71,18 @@ public static void setUpBeforeClass() throws Exception {
     admin = UTIL.getConnection().getAdmin();
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownAfterClass() throws Exception {
     admin.close();
     UTIL.shutdownMiniCluster();
   }
 
-  @Before
+  @BeforeEach
   public void setUp() {
     hasAccess = false;
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     hasAccess = true;
   }
@@ -105,7 +101,7 @@ public void testHMConnectorServerWhenStopMaster() throws Exception {
       LOG.info("Exception occurred while stopping HMaster. ", e);
       accessDenied = true;
     }
-    Assert.assertTrue(accessDenied);
+    Assertions.assertTrue(accessDenied);
 
     checkConnector();
   }
@@ -136,7 +132,7 @@ public void testHMConnectorServerWhenShutdownCluster() throws Exception {
       LOG.error("Exception occurred while stopping HMaster. ", e);
       accessDenied = true;
     }
-    Assert.assertTrue(accessDenied);
+    Assertions.assertTrue(accessDenied);
 
     checkConnector();
   }
@@ -149,10 +145,10 @@ private void checkConnector() throws Exception {
         .connect(JMXListener.buildJMXServiceURL(rmiRegistryPort, rmiRegistryPort));
     } catch (IOException e) {
       if (e.getCause() instanceof ServiceUnavailableException) {
-        Assert.fail("Can't connect to ConnectorServer.");
+        Assertions.fail("Can't connect to ConnectorServer.");
       }
     }
-    Assert.assertNotNull("JMXConnector should not be null.", connector);
+    Assertions.assertNotNull(connector, "JMXConnector should not be null.");
     connector.close();
   }
 
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java
index 58978697b488..d8bab2037d80 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java
@@ -17,7 +17,8 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import javax.management.MBeanServerConnection;
@@ -29,29 +30,23 @@
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.JVMClusterUtil;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestJMXListener {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestJMXListener.class);
-
   private static final Logger LOG = LoggerFactory.getLogger(TestJMXListener.class);
   private static HBaseTestingUtil UTIL = new HBaseTestingUtil();
   private static int CONNECTOR_PORT;
 
-  @BeforeClass
+  @BeforeAll
   public static void setupBeforeClass() throws Exception {
     // Default RMI timeouts are too long. Make them short for test.
     System.setProperty("sun.rmi.transport.connectionTimeout", Integer.toString(5000));
@@ -89,7 +84,7 @@ public static void setupBeforeClass() throws Exception {
     }
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownAfterClass() throws Exception {
     UTIL.shutdownMiniCluster();
   }
@@ -101,14 +96,12 @@ public void testStart() throws Exception {
 
     MBeanServerConnection mb = connector.getMBeanServerConnection();
     String domain = mb.getDefaultDomain();
-    Assert.assertTrue("default domain is not correct", !domain.isEmpty());
+    Assertions.assertTrue(!domain.isEmpty(), "default domain is not correct");
     connector.close();
 
   }
 
   // shutdown hbase only. then try connect, IOException expected
-  @Rule
-  public ExpectedException expectedEx = ExpectedException.none();
 
   @Test
   public void testStop() throws Exception {
@@ -120,8 +113,7 @@ public void testStop() throws Exception {
 
     JMXConnector connector = JMXConnectorFactory
       .newJMXConnector(JMXListener.buildJMXServiceURL(CONNECTOR_PORT, CONNECTOR_PORT), null);
-    expectedEx.expect(IOException.class);
-    connector.connect();
+    assertThrows(IOException.class, () -> connector.connect());
 
   }
 
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java
index 79cd93d460f8..ff5b88897e71 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java
@@ -17,7 +17,8 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import org.apache.hadoop.conf.Configuration;
@@ -25,17 +26,13 @@
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.zookeeper.KeeperException;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestLocalHBaseCluster {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestLocalHBaseCluster.class);
-
   private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
 
   /**
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java
index db87f163b669..d3cde97a741d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java
@@ -72,6 +72,7 @@
 @Tag(MediumTests.TAG)
 @SuppressWarnings("deprecation")
 public class TestMetaTableAccessor {
+
   private static final Logger LOG = LoggerFactory.getLogger(TestMetaTableAccessor.class);
   private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
   private static Connection connection;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java
index bbfa34d390f2..9b23716d43da 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java
@@ -17,9 +17,10 @@
  */
 package org.apache.hadoop.hbase;
 
-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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import org.apache.hadoop.hbase.master.RegionState;
@@ -30,13 +31,12 @@
 import org.apache.hadoop.hbase.zookeeper.MetaTableLocator;
 import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
 import org.apache.zookeeper.KeeperException;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,13 +51,10 @@
 /**
  * Test {@link org.apache.hadoop.hbase.zookeeper.MetaTableLocator}
  */
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestMetaTableLocator {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestMetaTableLocator.class);
-
   private static final Logger LOG = LoggerFactory.getLogger(TestMetaTableLocator.class);
   private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
   private static final ServerName SN =
@@ -65,19 +62,19 @@ public class TestMetaTableLocator {
   private ZKWatcher watcher;
   private Abortable abortable;
 
-  @BeforeClass
+  @BeforeAll
   public static void beforeClass() throws Exception {
     // Set this down so tests run quicker
     UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 3);
     UTIL.startMiniZKCluster();
   }
 
-  @AfterClass
+  @AfterAll
   public static void afterClass() throws IOException {
     UTIL.getZkCluster().shutdown();
   }
 
-  @Before
+  @BeforeEach
   public void before() throws IOException {
     this.abortable = new Abortable() {
       @Override
@@ -94,7 +91,7 @@ public boolean isAborted() {
       new ZKWatcher(UTIL.getConfiguration(), this.getClass().getSimpleName(), this.abortable, true);
   }
 
-  @After
+  @AfterEach
   public void after() {
     try {
       // Clean out meta location or later tests will be confused... they presume
@@ -140,9 +137,11 @@ public void testMetaLookup()
     assertNull(MetaTableLocator.getMetaRegionLocation(this.watcher));
   }
 
-  @Test(expected = NotAllMetaRegionsOnlineException.class)
+  @Test
   public void testTimeoutWaitForMeta() throws IOException, InterruptedException {
-    MetaTableLocator.waitMetaRegionLocation(watcher, 100);
+    assertThrows(NotAllMetaRegionsOnlineException.class, () -> {
+      MetaTableLocator.waitMetaRegionLocation(watcher, 100);
+    });
   }
 
   /**
@@ -170,7 +169,7 @@ private void startWaitAliveThenWaitItLives(final Thread t, final int ms) {
     UTIL.waitFor(2000, t::isAlive);
     // Wait one second.
     Threads.sleep(ms);
-    assertTrue("Assert " + t.getName() + " still waiting", t.isAlive());
+    assertTrue(t.isAlive(), "Assert " + t.getName() + " still waiting");
   }
 
   /**
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMovedRegionCache.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMovedRegionCache.java
index f5e09ba4b13d..f132418f43a2 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMovedRegionCache.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMovedRegionCache.java
@@ -17,9 +17,9 @@
  */
 package org.apache.hadoop.hbase;
 
-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.io.IOException;
 import org.apache.hadoop.hbase.client.RegionInfo;
@@ -28,37 +28,29 @@
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 
 import org.apache.hbase.thirdparty.com.google.common.collect.Iterables;
 
 /**
  * Test whether moved region cache is correct
  */
-@Category({ MiscTests.class, LargeTests.class })
+@Tag(MiscTests.TAG)
+@Tag(LargeTests.TAG)
 public class TestMovedRegionCache {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestMovedRegionCache.class);
-
-  @Rule
-  public TestName name = new TestName();
-
   private HBaseTestingUtil UTIL;
   private MiniZooKeeperCluster zkCluster;
   private HRegionServer source;
   private HRegionServer dest;
   private RegionInfo movedRegionInfo;
 
-  @Before
-  public void setup() throws Exception {
+  @BeforeEach
+  public void setup(TestInfo testInfo) throws Exception {
     UTIL = new HBaseTestingUtil();
     zkCluster = UTIL.startMiniZKCluster();
     StartTestingClusterOption option =
@@ -67,7 +59,7 @@ public void setup() throws Exception {
     source = cluster.getRegionServer(0);
     dest = cluster.getRegionServer(1);
     assertEquals(2, cluster.getRegionServerThreads().size());
-    TableName tableName = TableName.valueOf(name.getMethodName());
+    TableName tableName = TableName.valueOf(testInfo.getTestMethod().get().getName());
     UTIL.createTable(tableName, Bytes.toBytes("cf"));
     UTIL.waitTableAvailable(tableName, 30_000);
     movedRegionInfo = Iterables.getOnlyElement(cluster.getRegions(tableName)).getRegionInfo();
@@ -80,7 +72,7 @@ public boolean evaluate() throws IOException {
     });
   }
 
-  @After
+  @AfterEach
   public void after() throws Exception {
     UTIL.shutdownMiniCluster();
     if (zkCluster != null) {
@@ -97,10 +89,10 @@ public boolean evaluate() throws IOException {
         return dest.getOnlineRegion(movedRegionInfo.getRegionName()) != null;
       }
     });
-    assertNotNull("Moved region NOT in the cache!",
-      source.getMovedRegion(movedRegionInfo.getEncodedName()));
+    assertNotNull(source.getMovedRegion(movedRegionInfo.getEncodedName()),
+      "Moved region NOT in the cache!");
     Thread.sleep(source.movedRegionCacheExpiredTime());
-    assertNull("Expired moved region exist in the cache!",
-      source.getMovedRegion(movedRegionInfo.getEncodedName()));
+    assertNull(source.getMovedRegion(movedRegionInfo.getEncodedName()),
+      "Expired moved region exist in the cache!");
   }
 }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java
index 763451141317..7fee9f1c7c23 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java
@@ -17,12 +17,12 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -43,14 +43,12 @@
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Pair;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,33 +58,27 @@
  * Port of old TestScanMultipleVersions, TestTimestamp and TestGetRowVersions from old testing
  * framework to {@link HBaseTestingUtil}.
  */
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestMultiVersions {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestMultiVersions.class);
-
   private static final Logger LOG = LoggerFactory.getLogger(TestMultiVersions.class);
   private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
   private Admin admin;
 
   private static final int NUM_SLAVES = 3;
 
-  @Rule
-  public TestName name = new TestName();
-
-  @BeforeClass
+  @BeforeAll
   public static void setUpBeforeClass() throws Exception {
     UTIL.startMiniCluster(NUM_SLAVES);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownAfterClass() throws Exception {
     UTIL.shutdownMiniCluster();
   }
 
-  @Before
+  @BeforeEach
   public void before() throws MasterNotRunningException, ZooKeeperConnectionException, IOException {
     this.admin = UTIL.getAdmin();
   }
@@ -100,9 +92,9 @@ public void before() throws MasterNotRunningException, ZooKeeperConnectionExcept
    * than a single test per spin up. Keep old tests' crazyness.
    */
   @Test
-  public void testTimestamps() throws Exception {
+  public void testTimestamps(TestInfo testInfo) throws Exception {
     TableDescriptor tableDescriptor =
-      TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))
+      TableDescriptorBuilder.newBuilder(TableName.valueOf(testInfo.getTestMethod().get().getName()))
         .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(TimestampTestBase.FAMILY_NAME)
           .setMaxVersions(3).build())
         .build();
@@ -136,7 +128,7 @@ public void flushcache() throws IOException {
    * more than a single test per spin up. Keep old tests' crazyness.
    */
   @Test
-  public void testGetRowVersions() throws Exception {
+  public void testGetRowVersions(TestInfo testInfo) throws Exception {
     final byte[] contents = Bytes.toBytes("contents");
     final byte[] row = Bytes.toBytes("row");
     final byte[] value1 = Bytes.toBytes("value1");
@@ -144,7 +136,7 @@ public void testGetRowVersions() throws Exception {
     final long timestamp1 = 100L;
     final long timestamp2 = 200L;
     TableDescriptor tableDescriptor = TableDescriptorBuilder
-      .newBuilder(TableName.valueOf(name.getMethodName()))
+      .newBuilder(TableName.valueOf(testInfo.getTestMethod().get().getName()))
       .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(contents).setMaxVersions(3).build())
       .build();
     this.admin.createTable(tableDescriptor);
@@ -199,8 +191,8 @@ public void testGetRowVersions() throws Exception {
    * Tests five cases of scans and timestamps.
    */
   @Test
-  public void testScanMultipleVersions() throws Exception {
-    final TableName tableName = TableName.valueOf(name.getMethodName());
+  public void testScanMultipleVersions(TestInfo testInfo) throws Exception {
+    final TableName tableName = TableName.valueOf(testInfo.getTestMethod().get().getName());
     TableDescriptor tableDescriptor = TableDescriptorBuilder.newBuilder(tableName)
       .setColumnFamily(ColumnFamilyDescriptorBuilder.of(HConstants.CATALOG_FAMILY)).build();
 
@@ -254,7 +246,7 @@ public void testScanMultipleVersions() throws Exception {
     try (ResultScanner s = table.getScanner(scan)) {
       count = Iterables.size(s);
     }
-    assertEquals("Number of rows should be 2", 2, count);
+    assertEquals(2, count, "Number of rows should be 2");
 
     // Case 2: Scan with a timestamp greater than most recent timestamp
     // (in this case > 1000 and < LATEST_TIMESTAMP. Should get 2 rows.
@@ -264,7 +256,7 @@ public void testScanMultipleVersions() throws Exception {
     try (ResultScanner s = table.getScanner(scan)) {
       count = Iterables.size(s);
     }
-    assertEquals("Number of rows should be 2", 2, count);
+    assertEquals(2, count, "Number of rows should be 2");
 
     // Case 3: scan with timestamp equal to most recent timestamp
     // (in this case == 1000. Should get 2 rows.
@@ -274,7 +266,7 @@ public void testScanMultipleVersions() throws Exception {
     try (ResultScanner s = table.getScanner(scan)) {
       count = Iterables.size(s);
     }
-    assertEquals("Number of rows should be 2", 2, count);
+    assertEquals(2, count, "Number of rows should be 2");
 
     // Case 4: scan with timestamp greater than first timestamp but less than
     // second timestamp (100 < timestamp < 1000). Should get 2 rows.
@@ -284,7 +276,7 @@ public void testScanMultipleVersions() throws Exception {
     try (ResultScanner s = table.getScanner(scan)) {
       count = Iterables.size(s);
     }
-    assertEquals("Number of rows should be 2", 2, count);
+    assertEquals(2, count, "Number of rows should be 2");
 
     // Case 5: scan with timestamp equal to first timestamp (100)
     // Should get 2 rows.
@@ -294,7 +286,7 @@ public void testScanMultipleVersions() throws Exception {
     try (ResultScanner s = table.getScanner(scan)) {
       count = Iterables.size(s);
     }
-    assertEquals("Number of rows should be 2", 2, count);
+    assertEquals(2, count, "Number of rows should be 2");
   }
 
 }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java
index 0005a2becde7..d98b14b3d894 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java
@@ -17,10 +17,10 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-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.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.util.List;
@@ -41,27 +41,21 @@
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.hbase.thirdparty.com.google.common.collect.Sets;
 
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestNamespace {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestNamespace.class);
-
   private static final Logger LOG = LoggerFactory.getLogger(TestNamespace.class);
   private static HMaster master;
   protected final static int NUM_SLAVES_BASE = 4;
@@ -70,10 +64,7 @@ public class TestNamespace {
   protected static HBaseClusterInterface cluster;
   private String prefix = "TestNamespace";
 
-  @Rule
-  public TestName name = new TestName();
-
-  @BeforeClass
+  @BeforeAll
   public static void setUp() throws Exception {
     TEST_UTIL = new HBaseTestingUtil();
     TEST_UTIL.startMiniCluster(NUM_SLAVES_BASE);
@@ -83,12 +74,12 @@ public static void setUp() throws Exception {
     LOG.info("Done initializing cluster");
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() throws Exception {
     TEST_UTIL.shutdownMiniCluster();
   }
 
-  @Before
+  @BeforeEach
   public void beforeMethod() throws IOException {
     for (TableDescriptor desc : admin.listTableDescriptors(Pattern.compile(prefix + ".*"))) {
       admin.disableTable(desc.getTableName());
@@ -172,9 +163,9 @@ public void testDeleteReservedNS() throws Exception {
   }
 
   @Test
-  public void createRemoveTest() throws Exception {
-    String nsName = prefix + "_" + name.getMethodName();
-    LOG.info(name.getMethodName());
+  public void createRemoveTest(TestInfo testInfo) throws Exception {
+    String nsName = prefix + "_" + testInfo.getTestMethod().get().getName();
+    LOG.info(testInfo.getTestMethod().get().getName());
 
     // create namespace and verify
     admin.createNamespace(NamespaceDescriptor.create(nsName).build());
@@ -187,12 +178,13 @@ public void createRemoveTest() throws Exception {
   }
 
   @Test
-  public void createDoubleTest() throws IOException, InterruptedException {
-    String nsName = prefix + "_" + name.getMethodName();
-    LOG.info(name.getMethodName());
+  public void createDoubleTest(TestInfo testInfo) throws IOException, InterruptedException {
+    String nsName = prefix + "_" + testInfo.getTestMethod().get().getName();
+    LOG.info(testInfo.getTestMethod().get().getName());
 
-    final TableName tableName = TableName.valueOf(name.getMethodName());
-    final TableName tableNameFoo = TableName.valueOf(nsName + ":" + name.getMethodName());
+    final TableName tableName = TableName.valueOf(testInfo.getTestMethod().get().getName());
+    final TableName tableNameFoo =
+      TableName.valueOf(nsName + ":" + testInfo.getTestMethod().get().getName());
     // create namespace and verify
     admin.createNamespace(NamespaceDescriptor.create(nsName).build());
     TEST_UTIL.createTable(tableName, Bytes.toBytes(nsName));
@@ -207,12 +199,12 @@ public void createDoubleTest() throws IOException, InterruptedException {
   }
 
   @Test
-  public void createTableTest() throws IOException, InterruptedException {
-    String nsName = prefix + "_" + name.getMethodName();
-    LOG.info(name.getMethodName());
+  public void createTableTest(TestInfo testInfo) throws IOException, InterruptedException {
+    String nsName = prefix + "_" + testInfo.getTestMethod().get().getName();
+    LOG.info(testInfo.getTestMethod().get().getName());
 
-    TableDescriptorBuilder tableDescriptorBuilder =
-      TableDescriptorBuilder.newBuilder(TableName.valueOf(nsName + ":" + name.getMethodName()));
+    TableDescriptorBuilder tableDescriptorBuilder = TableDescriptorBuilder
+      .newBuilder(TableName.valueOf(nsName + ":" + testInfo.getTestMethod().get().getName()));
     ColumnFamilyDescriptor columnFamilyDescriptor =
       ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("my_cf")).build();
     tableDescriptorBuilder.setColumnFamily(columnFamilyDescriptor);
@@ -256,9 +248,9 @@ public void createTableTest() throws IOException, InterruptedException {
   }
 
   @Test
-  public void createTableInDefaultNamespace() throws Exception {
-    TableDescriptorBuilder tableDescriptorBuilder =
-      TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()));
+  public void createTableInDefaultNamespace(TestInfo testInfo) throws Exception {
+    TableDescriptorBuilder tableDescriptorBuilder = TableDescriptorBuilder
+      .newBuilder(TableName.valueOf(testInfo.getTestMethod().get().getName()));
     ColumnFamilyDescriptor columnFamilyDescriptor =
       ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("cf1")).build();
     tableDescriptorBuilder.setColumnFamily(columnFamilyDescriptor);
@@ -270,8 +262,9 @@ public void createTableInDefaultNamespace() throws Exception {
   }
 
   @Test
-  public void createTableInSystemNamespace() throws Exception {
-    final TableName tableName = TableName.valueOf("hbase:" + name.getMethodName());
+  public void createTableInSystemNamespace(TestInfo testInfo) throws Exception {
+    final TableName tableName =
+      TableName.valueOf("hbase:" + testInfo.getTestMethod().get().getName());
     TableDescriptorBuilder tableDescriptorBuilder = TableDescriptorBuilder.newBuilder(tableName);
     ColumnFamilyDescriptor columnFamilyDescriptor =
       ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("cf1")).build();
@@ -285,7 +278,7 @@ public void createTableInSystemNamespace() throws Exception {
   }
 
   @Test
-  public void testNamespaceOperations() throws IOException {
+  public void testNamespaceOperations(TestInfo testInfo) throws IOException {
     admin.createNamespace(NamespaceDescriptor.create(prefix + "ns1").build());
     admin.createNamespace(NamespaceDescriptor.create(prefix + "ns2").build());
 
@@ -302,8 +295,8 @@ public Void call() throws Exception {
     runWithExpectedException(new Callable<Void>() {
       @Override
       public Void call() throws Exception {
-        TableDescriptorBuilder tableDescriptorBuilder = TableDescriptorBuilder
-          .newBuilder(TableName.valueOf("non_existing_namespace", name.getMethodName()));
+        TableDescriptorBuilder tableDescriptorBuilder = TableDescriptorBuilder.newBuilder(
+          TableName.valueOf("non_existing_namespace", testInfo.getTestMethod().get().getName()));
         ColumnFamilyDescriptor columnFamilyDescriptor =
           ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("family1")).build();
         tableDescriptorBuilder.setColumnFamily(columnFamilyDescriptor);
@@ -350,16 +343,16 @@ public Void call() throws Exception {
     }, NamespaceNotFoundException.class);
 
     // get table descriptors for existing namespace
-    TableDescriptorBuilder tableDescriptorBuilder =
-      TableDescriptorBuilder.newBuilder(TableName.valueOf(prefix + "ns1", name.getMethodName()));
+    TableDescriptorBuilder tableDescriptorBuilder = TableDescriptorBuilder
+      .newBuilder(TableName.valueOf(prefix + "ns1", testInfo.getTestMethod().get().getName()));
     ColumnFamilyDescriptor columnFamilyDescriptor =
       ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("family1")).build();
     tableDescriptorBuilder.setColumnFamily(columnFamilyDescriptor);
     admin.createTable(tableDescriptorBuilder.build());
     List<TableDescriptor> htds =
       admin.listTableDescriptorsByNamespace(Bytes.toBytes(prefix + "ns1"));
-    assertNotNull("Should have not returned null", htds);
-    assertEquals("Should have returned non-empty array", 1, htds.size());
+    assertNotNull(htds, "Should have not returned null");
+    assertEquals(1, htds.size(), "Should have returned non-empty array");
 
     // get table descriptors for non-existing namespace
     runWithExpectedException(new Callable<Void>() {
@@ -372,8 +365,8 @@ public Void call() throws Exception {
 
     // get table names for existing namespace
     TableName[] tableNames = admin.listTableNamesByNamespace(prefix + "ns1");
-    assertNotNull("Should have not returned null", tableNames);
-    assertEquals("Should have returned non-empty array", 1, tableNames.length);
+    assertNotNull(tableNames, "Should have not returned null");
+    assertEquals(1, tableNames.length, "Should have returned non-empty array");
 
     // get table names for non-existing namespace
     runWithExpectedException(new Callable<Void>() {
@@ -391,7 +384,7 @@ private static <V, E> void runWithExpectedException(Callable<V> callable,
     try {
       callable.call();
     } catch (Exception ex) {
-      Assert.assertEquals(exceptionClass, ex.getClass());
+      assertEquals(exceptionClass, ex.getClass());
       return;
     }
     fail("Should have thrown exception " + exceptionClass);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java
index 442a5a5483e6..6139e0eaa8fc 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java
@@ -17,9 +17,9 @@
  */
 package org.apache.hadoop.hbase;
 
-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.io.File;
 import java.io.FileOutputStream;
@@ -32,27 +32,23 @@
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.util.Shell;
-import org.junit.After;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Category({ MiscTests.class, SmallTests.class })
+@Tag(MiscTests.TAG)
+@Tag(SmallTests.TAG)
 public class TestNodeHealthCheckChore {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestNodeHealthCheckChore.class);
-
   private static final Logger LOG = LoggerFactory.getLogger(TestNodeHealthCheckChore.class);
   private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
   private static final int SCRIPT_TIMEOUT = 5000;
   private File healthScriptFile;
   private String eol = System.getProperty("line.separator");
 
-  @After
+  @AfterEach
   public void cleanUp() throws IOException {
     // delete and recreate the test directory, ensuring a clean test dir between tests
     Path testDir = UTIL.getDataTestDir();
@@ -109,9 +105,9 @@ public void testRSHealthChore() throws Exception {
       // Default threshold is three.
       rsChore.chore();
       rsChore.chore();
-      assertFalse("Stoppable must not be stopped.", stop.isStopped());
+      assertFalse(stop.isStopped(), "Stoppable must not be stopped.");
       rsChore.chore();
-      assertTrue("Stoppable must have been stopped.", stop.isStopped());
+      assertTrue(stop.isStopped(), "Stoppable must have been stopped.");
     } finally {
       stop.stop("Finished w/ test");
     }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPartialResultsFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPartialResultsFromClientSide.java
index 299f833c7c81..4f597837d640 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPartialResultsFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPartialResultsFromClientSide.java
@@ -17,12 +17,12 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+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.io.IOException;
 import java.util.ArrayList;
@@ -43,13 +43,11 @@
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.ClassSize;
 import org.apache.hadoop.hbase.util.Pair;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -63,13 +61,9 @@
  * Unless the flag {@link Scan#setAllowPartialResults(boolean)} has been set to true, the caller of
  * {@link ResultScanner#next()} should never see partial results.
  */
-@Category(LargeTests.class)
+@Tag(LargeTests.TAG)
 public class TestPartialResultsFromClientSide {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestPartialResultsFromClientSide.class);
-
   private static final Logger LOG = LoggerFactory.getLogger(TestPartialResultsFromClientSide.class);
 
   private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
@@ -107,10 +101,7 @@ public class TestPartialResultsFromClientSide {
 
   private static long timeout = 10000;
 
-  @Rule
-  public TestName name = new TestName();
-
-  @BeforeClass
+  @BeforeAll
   public static void setUpBeforeClass() throws Exception {
     TEST_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, timeout);
     TEST_UTIL.startMiniCluster(MINICLUSTER_SIZE);
@@ -127,7 +118,7 @@ static Table createTestTable(TableName name, byte[][] rows, byte[][] families,
     return ht;
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownAfterClass() throws Exception {
     TEST_UTIL.shutdownMiniCluster();
   }
@@ -230,7 +221,7 @@ public void testEquivalenceOfScanResults(Table table, Scan scan1, Scan scan2) th
     }
 
     r2 = scanner2.next();
-    assertTrue("r2: " + r2 + " Should be null", r2 == null);
+    assertTrue(r2 == null, "r2: " + r2 + " Should be null");
 
     scanner1.close();
     scanner2.close();
@@ -275,26 +266,26 @@ public void testOrderingOfCellsInPartialResults(final Scan basePartialScan) thro
       List<Cell> aggregatePartialCells = new ArrayList<>();
       do {
         partialResult = partialScanner.next();
-        assertTrue("Partial Result is null. iteration: " + iterationCount, partialResult != null);
-        assertTrue("Partial cells are null. iteration: " + iterationCount,
-          partialResult.rawCells() != null);
+        assertTrue(partialResult != null, "Partial Result is null. iteration: " + iterationCount);
+        assertTrue(partialResult.rawCells() != null,
+          "Partial cells are null. iteration: " + iterationCount);
 
         for (Cell c : partialResult.rawCells()) {
           aggregatePartialCells.add(c);
         }
       } while (partialResult.mayHaveMoreCellsInRow());
 
-      assertTrue("Number of cells differs. iteration: " + iterationCount,
-        oneShotResult.rawCells().length == aggregatePartialCells.size());
+      assertTrue(oneShotResult.rawCells().length == aggregatePartialCells.size(),
+        "Number of cells differs. iteration: " + iterationCount);
       final Cell[] oneShotCells = oneShotResult.rawCells();
       for (int cell = 0; cell < oneShotCells.length; cell++) {
         Cell oneShotCell = oneShotCells[cell];
         Cell partialCell = aggregatePartialCells.get(cell);
 
-        assertTrue("One shot cell was null", oneShotCell != null);
-        assertTrue("Partial cell was null", partialCell != null);
-        assertTrue("Cell differs. oneShotCell:" + oneShotCell + " partialCell:" + partialCell,
-          oneShotCell.equals(partialCell));
+        assertTrue(oneShotCell != null, "One shot cell was null");
+        assertTrue(partialCell != null, "Partial cell was null");
+        assertTrue(oneShotCell.equals(partialCell),
+          "Cell differs. oneShotCell:" + oneShotCell + " partialCell:" + partialCell);
       }
 
       oneShotResult = oneShotScanner.next();
@@ -349,9 +340,10 @@ public void testExpectedNumberOfCellsPerPartialResult(Scan baseScan, int expecte
       // 1. Returned result is the final result needed to form the complete result for that row
       // 2. It is the first result we have seen for that row and thus may have been fetched as
       // the last group of cells that fit inside the maxResultSize
-      assertTrue("Result's cell count differed from expected number. result: " + result,
+      assertTrue(
         result.rawCells().length == expectedNumberOfCells || !result.mayHaveMoreCellsInRow()
-          || !Bytes.equals(prevRow, result.getRow()));
+          || !Bytes.equals(prevRow, result.getRow()),
+        "Result's cell count differed from expected number. result: " + result);
       prevRow = result.getRow();
     }
 
@@ -427,7 +419,7 @@ public void testPartialResultsAndBatch(final int batch, final int cellsPerPartia
       if (result.mayHaveMoreCellsInRow()) {
         final String error = "Cells:" + result.rawCells().length + " Batch size:" + batch
           + " cellsPerPartialResult:" + cellsPerPartialResult + " rep:" + repCount;
-        assertTrue(error, result.rawCells().length == batch);
+        assertTrue(result.rawCells().length == batch, error);
       } else {
         assertTrue(result.rawCells().length <= batch);
       }
@@ -647,8 +639,8 @@ static void verifyResult(Result result, List<Cell> expKvList, String msg) {
       }
 
       Cell kvExp = expKvList.get(i++);
-      assertTrue("Not equal. get kv: " + kv.toString() + " exp kv: " + kvExp.toString(),
-        kvExp.equals(kv));
+      assertTrue(kvExp.equals(kv),
+        "Not equal. get kv: " + kv.toString() + " exp kv: " + kvExp.toString());
     }
 
     assertEquals(expKvList.size(), result.size());
@@ -676,8 +668,8 @@ static void compareResults(Result r1, Result r2, final String message) {
   }
 
   @Test
-  public void testReadPointAndPartialResults() throws Exception {
-    final TableName tableName = TableName.valueOf(name.getMethodName());
+  public void testReadPointAndPartialResults(TestInfo testInfo) throws Exception {
+    final TableName tableName = TableName.valueOf(testInfo.getTestMethod().get().getName());
     int numRows = 5;
     int numFamilies = 5;
     int numQualifiers = 5;
@@ -705,15 +697,15 @@ public void testReadPointAndPartialResults() throws Exception {
     // Should see all cells because scanner was opened prior to deletes
     scannerCount += countCellsFromScanner(scanner);
     int expectedCount = numRows * numFamilies * numQualifiers;
-    assertTrue("scannerCount: " + scannerCount + " expectedCount: " + expectedCount,
-      scannerCount == expectedCount);
+    assertTrue(scannerCount == expectedCount,
+      "scannerCount: " + scannerCount + " expectedCount: " + expectedCount);
 
     // Minus 2 for the two cells that were deleted
     scanner = tmpTable.getScanner(new Scan().setMaxResultSize(1).setAllowPartialResults(true));
     scannerCount = countCellsFromScanner(scanner);
     expectedCount = numRows * numFamilies * numQualifiers - 2;
-    assertTrue("scannerCount: " + scannerCount + " expectedCount: " + expectedCount,
-      scannerCount == expectedCount);
+    assertTrue(scannerCount == expectedCount,
+      "scannerCount: " + scannerCount + " expectedCount: " + expectedCount);
 
     scanner = tmpTable.getScanner(new Scan().setMaxResultSize(1).setAllowPartialResults(true));
     scannerCount = scanner.next().rawCells().length;
@@ -729,15 +721,15 @@ public void testReadPointAndPartialResults() throws Exception {
     // Scanner opened prior to puts. Cell count shouldn't have changed
     scannerCount += countCellsFromScanner(scanner);
     expectedCount = numRows * numFamilies * numQualifiers - 2;
-    assertTrue("scannerCount: " + scannerCount + " expectedCount: " + expectedCount,
-      scannerCount == expectedCount);
+    assertTrue(scannerCount == expectedCount,
+      "scannerCount: " + scannerCount + " expectedCount: " + expectedCount);
 
     // Now the scanner should see the cells that were added by puts
     scanner = tmpTable.getScanner(new Scan().setMaxResultSize(1).setAllowPartialResults(true));
     scannerCount = countCellsFromScanner(scanner);
     expectedCount = numRows * numFamilies * numQualifiers;
-    assertTrue("scannerCount: " + scannerCount + " expectedCount: " + expectedCount,
-      scannerCount == expectedCount);
+    assertTrue(scannerCount == expectedCount,
+      "scannerCount: " + scannerCount + " expectedCount: " + expectedCount);
 
     TEST_UTIL.deleteTable(tableName);
   }
@@ -809,9 +801,9 @@ private void assertCell(Cell cell, byte[] row, byte[] cf, byte[] cq) {
   }
 
   @Test
-  public void testPartialResultWhenRegionMove() throws IOException {
-    Table table =
-      createTestTable(TableName.valueOf(name.getMethodName()), ROWS, FAMILIES, QUALIFIERS, VALUE);
+  public void testPartialResultWhenRegionMove(TestInfo testInfo) throws IOException {
+    Table table = createTestTable(TableName.valueOf(testInfo.getTestMethod().get().getName()), ROWS,
+      FAMILIES, QUALIFIERS, VALUE);
 
     moveRegion(table, 1);
 
@@ -847,9 +839,9 @@ public void testPartialResultWhenRegionMove() throws IOException {
   }
 
   @Test
-  public void testReversedPartialResultWhenRegionMove() throws IOException {
-    Table table =
-      createTestTable(TableName.valueOf(name.getMethodName()), ROWS, FAMILIES, QUALIFIERS, VALUE);
+  public void testReversedPartialResultWhenRegionMove(TestInfo testInfo) throws IOException {
+    Table table = createTestTable(TableName.valueOf(testInfo.getTestMethod().get().getName()), ROWS,
+      FAMILIES, QUALIFIERS, VALUE);
 
     moveRegion(table, 1);
 
@@ -886,9 +878,9 @@ public void testReversedPartialResultWhenRegionMove() throws IOException {
   }
 
   @Test
-  public void testCompleteResultWhenRegionMove() throws IOException {
-    Table table =
-      createTestTable(TableName.valueOf(name.getMethodName()), ROWS, FAMILIES, QUALIFIERS, VALUE);
+  public void testCompleteResultWhenRegionMove(TestInfo testInfo) throws IOException {
+    Table table = createTestTable(TableName.valueOf(testInfo.getTestMethod().get().getName()), ROWS,
+      FAMILIES, QUALIFIERS, VALUE);
 
     moveRegion(table, 1);
 
@@ -922,9 +914,9 @@ public void testCompleteResultWhenRegionMove() throws IOException {
   }
 
   @Test
-  public void testReversedCompleteResultWhenRegionMove() throws IOException {
-    Table table =
-      createTestTable(TableName.valueOf(name.getMethodName()), ROWS, FAMILIES, QUALIFIERS, VALUE);
+  public void testReversedCompleteResultWhenRegionMove(TestInfo testInfo) throws IOException {
+    Table table = createTestTable(TableName.valueOf(testInfo.getTestMethod().get().getName()), ROWS,
+      FAMILIES, QUALIFIERS, VALUE);
 
     moveRegion(table, 1);
 
@@ -959,12 +951,12 @@ public void testReversedCompleteResultWhenRegionMove() throws IOException {
   }
 
   @Test
-  public void testBatchingResultWhenRegionMove() throws IOException {
+  public void testBatchingResultWhenRegionMove(TestInfo testInfo) throws IOException {
     // If user setBatch(5) and rpc returns 3+5+5+5+3 cells,
     // we should return 5+5+5+5+1 to user.
     // setBatch doesn't mean setAllowPartialResult(true)
-    Table table =
-      createTestTable(TableName.valueOf(name.getMethodName()), ROWS, FAMILIES, QUALIFIERS, VALUE);
+    Table table = createTestTable(TableName.valueOf(testInfo.getTestMethod().get().getName()), ROWS,
+      FAMILIES, QUALIFIERS, VALUE);
 
     Put put = new Put(ROWS[1]);
     put.addColumn(FAMILIES[0], QUALIFIERS[1], new byte[VALUE_SIZE * 10]);
@@ -1035,9 +1027,9 @@ public void testBatchingResultWhenRegionMove() throws IOException {
   }
 
   @Test
-  public void testDontThrowUnknowScannerExceptionToClient() throws Exception {
-    Table table =
-      createTestTable(TableName.valueOf(name.getMethodName()), ROWS, FAMILIES, QUALIFIERS, VALUE);
+  public void testDontThrowUnknowScannerExceptionToClient(TestInfo testInfo) throws Exception {
+    Table table = createTestTable(TableName.valueOf(testInfo.getTestMethod().get().getName()), ROWS,
+      FAMILIES, QUALIFIERS, VALUE);
     Scan scan = new Scan();
     scan.setCaching(1);
     ResultScanner scanner = table.getScanner(scan);
@@ -1052,9 +1044,10 @@ public void testDontThrowUnknowScannerExceptionToClient() throws Exception {
   }
 
   @Test
-  public void testMayHaveMoreCellsInRowReturnsTrueAndSetBatch() throws IOException {
-    Table table =
-      createTestTable(TableName.valueOf(name.getMethodName()), ROWS, FAMILIES, QUALIFIERS, VALUE);
+  public void testMayHaveMoreCellsInRowReturnsTrueAndSetBatch(TestInfo testInfo)
+    throws IOException {
+    Table table = createTestTable(TableName.valueOf(testInfo.getTestMethod().get().getName()), ROWS,
+      FAMILIES, QUALIFIERS, VALUE);
     Scan scan = new Scan();
     scan.setBatch(1);
     scan.setFilter(new FirstKeyOnlyFilter());
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionMetrics.java
index d8bbe2fea20f..3faa2be01595 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionMetrics.java
@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.hbase;
 
-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.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -36,23 +36,19 @@
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.hbase.thirdparty.com.google.common.collect.Maps;
 
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestRegionMetrics {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestRegionMetrics.class);
-
   private static final Logger LOG = LoggerFactory.getLogger(TestRegionMetrics.class);
   private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
   private static Admin admin;
@@ -63,7 +59,7 @@ public class TestRegionMetrics {
   private static final TableName[] tables = new TableName[] { TABLE_1, TABLE_2, TABLE_3 };
   private static final int MSG_INTERVAL = 500; // ms
 
-  @BeforeClass
+  @BeforeAll
   public static void beforeClass() throws Exception {
     // Make servers report eagerly. This test is about looking at the cluster status reported.
     // Make it so we don't have to wait around too long to see change.
@@ -79,7 +75,7 @@ public static void beforeClass() throws Exception {
     }
   }
 
-  @AfterClass
+  @AfterAll
   public static void afterClass() throws Exception {
     for (TableName table : tables) {
       UTIL.deleteTableIfAny(table);
@@ -146,8 +142,8 @@ private void checkMetricsValue(List<RegionMetrics> regionMetrics, ServerMetrics
         ) {
           Object valueRm = method.invoke(fromRM);
           Object valueSM = method.invoke(fromSM);
-          assertEquals("Return values of method " + method.getName() + " are different",
-            valueRm.toString(), valueSM.toString());
+          assertEquals(valueRm.toString(), valueSM.toString(),
+            "Return values of method " + method.getName() + " are different");
         }
       }
     }
@@ -156,16 +152,17 @@ private void checkMetricsValue(List<RegionMetrics> regionMetrics, ServerMetrics
   private void checkRegionsAndRegionMetrics(Collection<RegionInfo> regions,
     Collection<RegionMetrics> regionMetrics) {
 
-    assertEquals("No of regions and regionMetrics doesn't match", regions.size(),
-      regionMetrics.size());
+    assertEquals(regions.size(), regionMetrics.size(),
+      "No of regions and regionMetrics doesn't match");
 
     Map<byte[], RegionMetrics> regionMetricsMap = Maps.newTreeMap(Bytes.BYTES_COMPARATOR);
     for (RegionMetrics r : regionMetrics) {
       regionMetricsMap.put(r.getRegionName(), r);
     }
     for (RegionInfo info : regions) {
-      assertTrue("Region not in RegionMetricsMap region:" + info.getRegionNameAsString()
-        + " regionMap: " + regionMetricsMap, regionMetricsMap.containsKey(info.getRegionName()));
+      assertTrue(regionMetricsMap.containsKey(info.getRegionName()),
+        "Region not in RegionMetricsMap region:" + info.getRegionNameAsString() + " regionMap: "
+          + regionMetricsMap);
     }
   }
 }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
index 99a9e47b5ee4..9e445d070fa6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
@@ -17,16 +17,16 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
+import java.util.stream.Stream;
 import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.BalanceResponse;
 import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
@@ -42,14 +42,11 @@
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.JVMClusterUtil;
 import org.apache.hadoop.hbase.util.Threads;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.params.provider.Arguments;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,20 +57,14 @@
  * balancing, not per table wide. Increase the margin a little to make StochasticLoadBalancer result
  * acceptable.
  */
-@Category({ FlakeyTests.class, LargeTests.class })
-@RunWith(value = Parameterized.class)
+@Tag(FlakeyTests.TAG)
+@Tag(LargeTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: balancer = {0}")
 public class TestRegionRebalancing {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestRegionRebalancing.class);
-
-  @Parameters
-  public static Collection<Object[]> data() {
-    Object[][] balancers =
-      new String[][] { { "org.apache.hadoop.hbase.master.balancer.SimpleLoadBalancer" },
-        { "org.apache.hadoop.hbase.master.balancer.StochasticLoadBalancer" } };
-    return Arrays.asList(balancers);
+  public static Stream<Arguments> parameters() {
+    return Stream.of(Arguments.of("org.apache.hadoop.hbase.master.balancer.SimpleLoadBalancer"),
+      Arguments.of("org.apache.hadoop.hbase.master.balancer.StochasticLoadBalancer"));
   }
 
   private static final byte[] FAMILY_NAME = Bytes.toBytes("col");
@@ -88,12 +79,12 @@ public TestRegionRebalancing(String balancerName) {
 
   }
 
-  @After
+  @AfterEach
   public void after() throws Exception {
     UTIL.shutdownMiniCluster();
   }
 
-  @Before
+  @BeforeEach
   public void before() throws Exception {
     UTIL.getConfiguration().set("hbase.master.loadbalancer.class", this.balancerName);
     // set minCostNeedBalance to 0, make sure balancer run
@@ -107,7 +98,7 @@ public void before() throws Exception {
    * For HBASE-71. Try a few different configurations of starting and stopping region servers to see
    * if the assignment or regions is pretty balanced.
    */
-  @Test
+  @TestTemplate
   public void testRebalanceOnRegionServerNumberChange() throws IOException, InterruptedException {
     try (Connection connection = ConnectionFactory.createConnection(UTIL.getConfiguration());
       Admin admin = connection.getAdmin()) {
@@ -117,8 +108,8 @@ public void testRebalanceOnRegionServerNumberChange() throws IOException, Interr
 
       MetaTableAccessor.fullScanMetaAndPrint(admin.getConnection());
 
-      assertEquals("Test table should have right number of regions", HBaseTestingUtil.KEYS.length,
-        this.regionLocator.getStartKeys().length);
+      assertEquals(HBaseTestingUtil.KEYS.length, this.regionLocator.getStartKeys().length,
+        "Test table should have right number of regions");
 
       // verify that the region assignments are balanced to start out
       assertRegionsAreBalanced();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionReplicationLagEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionReplicationLagEvaluation.java
index 003fe91b47e0..93aa8f2d0e32 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionReplicationLagEvaluation.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionReplicationLagEvaluation.java
@@ -17,36 +17,32 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.hadoop.hbase.metrics.impl.FastLongHistogram;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.ServerRegionReplicaUtil;
 import org.apache.hadoop.util.ToolRunner;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestRegionReplicationLagEvaluation {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestRegionReplicationLagEvaluation.class);
-
   private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() throws Exception {
     UTIL.getConfiguration().setBoolean(ServerRegionReplicaUtil.REGION_REPLICA_REPLICATION_CONF_KEY,
       true);
     UTIL.startMiniCluster(2);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() throws Exception {
     UTIL.shutdownMiniCluster();
   }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSequenceIdMonotonicallyIncreasing.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSequenceIdMonotonicallyIncreasing.java
index 0b5a71cf74e9..defdcd65926d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSequenceIdMonotonicallyIncreasing.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSequenceIdMonotonicallyIncreasing.java
@@ -17,7 +17,7 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.util.List;
@@ -39,23 +39,19 @@
 import org.apache.hadoop.hbase.wal.NoEOFWALStreamReader;
 import org.apache.hadoop.hbase.wal.WAL;
 import org.apache.hadoop.hbase.wal.WALStreamReader;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 /**
  * Testcase for HBASE-20066
  */
-@Category({ RegionServerTests.class, LargeTests.class })
+@Tag(RegionServerTests.TAG)
+@Tag(LargeTests.TAG)
 public class TestSequenceIdMonotonicallyIncreasing {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestSequenceIdMonotonicallyIncreasing.class);
-
   private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
 
   private static final TableName NAME = TableName.valueOf("test");
@@ -64,17 +60,17 @@ public class TestSequenceIdMonotonicallyIncreasing {
 
   private static final byte[] CQ = Bytes.toBytes("cq");
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpBeforeClass() throws Exception {
     UTIL.startMiniCluster(2);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownAfterClass() throws Exception {
     UTIL.shutdownMiniCluster();
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws IOException {
     Admin admin = UTIL.getAdmin();
     if (admin.tableExists(NAME)) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
index dc4ecd1ff8e6..b98c57615b30 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
@@ -17,10 +17,10 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-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.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -50,9 +50,8 @@
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.apache.hadoop.io.DataInputBuffer;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;
@@ -60,13 +59,10 @@
 /**
  * Test HBase Writables serializations
  */
-@Category({ MiscTests.class, SmallTests.class })
+@Tag(MiscTests.TAG)
+@Tag(SmallTests.TAG)
 public class TestSerialization {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestSerialization.class);
-
   @Test
   public void testKeyValue() throws Exception {
     final String name = "testKeyValue2";
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerInternalsTracing.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerInternalsTracing.java
index 69e6e4ac83df..eb6f8bd3b86f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerInternalsTracing.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerInternalsTracing.java
@@ -31,86 +31,58 @@
 import static org.hamcrest.Matchers.startsWith;
 
 import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension;
 import io.opentelemetry.sdk.trace.data.SpanData;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import org.apache.hadoop.hbase.client.trace.StringTraceRenderer;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.testclassification.RegionServerTests;
-import org.apache.hadoop.hbase.trace.OpenTelemetryClassRule;
 import org.hamcrest.Matcher;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.ExternalResource;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TestRule;
-import org.junit.runners.model.Statement;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Test that sundry operations internal to the region server are traced as expected.
  */
-@Category({ MediumTests.class, RegionServerTests.class })
+@Tag(RegionServerTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestServerInternalsTracing {
   private static final Logger LOG = LoggerFactory.getLogger(TestServerInternalsTracing.class);
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestServerInternalsTracing.class);
+  @RegisterExtension
+  private static final OpenTelemetryExtension OTEL_EXT = OpenTelemetryExtension.create();
 
   private static final String NO_PARENT_ID = "0000000000000000";
-  private static List<SpanData> spans;
-
-  /**
-   * Wait for the underlying cluster to come up -- defined by meta being available.
-   */
-  private static class Setup extends ExternalResource {
-    private final Supplier<HBaseTestingUtil> testingUtilSupplier;
-
-    public Setup(final Supplier<HBaseTestingUtil> testingUtilSupplier) {
-      this.testingUtilSupplier = testingUtilSupplier;
-    }
 
-    @Override
-    protected void before() throws Throwable {
-      final HBaseTestingUtil testingUtil = testingUtilSupplier.get();
-      testingUtil.waitTableAvailable(TableName.META_TABLE_NAME);
-    }
-  }
+  private static List<SpanData> spans;
 
-  private static class Noop extends Statement {
-    @Override
-    public void evaluate() throws Throwable {
+  @BeforeAll
+  public static void setUp() throws Exception {
+    HBaseTestingUtil util = new HBaseTestingUtil();
+    util.startMiniCluster();
+    // Wait for the underlying cluster to come up -- defined by meta being available.
+    util.waitTableAvailable(TableName.META_TABLE_NAME);
+    // shutdown the cluster
+    util.shutdownMiniCluster();
+    // copy the span data since it will be cleared after each test run
+    spans = new ArrayList<>(OTEL_EXT.getSpans());
+    if (LOG.isDebugEnabled()) {
+      StringTraceRenderer renderer = new StringTraceRenderer(spans);
+      renderer.render(LOG::debug);
     }
   }
 
-  @ClassRule
-  public static TestRule classRule = (base, description) -> new Statement() {
-    @Override
-    public void evaluate() throws Throwable {
-      // setup and tear down the cluster, collecting all the spans produced in the process.
-      final OpenTelemetryClassRule otelClassRule = OpenTelemetryClassRule.create();
-      final MiniClusterRule miniClusterRule = MiniClusterRule.newBuilder().build();
-      final Setup setup = new Setup(miniClusterRule::getTestingUtility);
-      final TestRule clusterRule =
-        RuleChain.outerRule(otelClassRule).around(miniClusterRule).around(setup);
-      clusterRule.apply(new Noop(), description).evaluate();
-      spans = otelClassRule.getSpans();
-      if (LOG.isDebugEnabled()) {
-        StringTraceRenderer renderer = new StringTraceRenderer(spans);
-        renderer.render(LOG::debug);
-      }
-      base.evaluate();
-    }
-  };
-
   @Test
   public void testHBaseServerBaseConstructor() {
     final Matcher<SpanData> hbaseServerBaseMatcher = allOf(hasName("HBaseServerBase.cxtor"),
       hasParentSpanId(NO_PARENT_ID), hasStatusWithCode(isOneOf(StatusCode.OK, StatusCode.ERROR)));
+
     assertThat("there should be a span from the HBaseServerBase constructor.", spans,
       hasItem(hbaseServerBaseMatcher));
     final List<SpanData> hbaseServerBaseSpans =
@@ -129,6 +101,7 @@ public void testHBaseServerBaseConstructor() {
   public void testHMasterConstructor() {
     final Matcher<SpanData> masterConstructorMatcher = allOf(hasName("HMaster.cxtor"),
       hasParentSpanId(NO_PARENT_ID), hasStatusWithCode(isOneOf(StatusCode.OK, StatusCode.ERROR)));
+
     assertThat("there should be a span from the HMaster constructor.", spans,
       hasItem(masterConstructorMatcher));
     final SpanData masterConstructorSpan = spans.stream().filter(masterConstructorMatcher::matches)
@@ -142,6 +115,7 @@ public void testHMasterBecomeActiveMaster() {
     final Matcher<SpanData> masterBecomeActiveMasterMatcher =
       allOf(hasName("HMaster.becomeActiveMaster"), hasParentSpanId(NO_PARENT_ID),
         hasStatusWithCode(isOneOf(StatusCode.OK, StatusCode.ERROR)));
+
     assertThat("there should be a span from the HMaster.becomeActiveMaster.", spans,
       hasItem(masterBecomeActiveMasterMatcher));
     final SpanData masterBecomeActiveMasterSpan = spans.stream()
@@ -166,6 +140,7 @@ public void testHMasterBecomeActiveMaster() {
   public void testZKWatcherHMaster() {
     final Matcher<SpanData> mZKWatcherMatcher = allOf(hasName(startsWith("ZKWatcher-master")),
       hasParentSpanId(NO_PARENT_ID), hasStatusWithCode(isOneOf(StatusCode.OK, StatusCode.ERROR)));
+
     assertThat("there should be a span from the ZKWatcher running in the HMaster.", spans,
       hasItem(mZKWatcherMatcher));
     final SpanData mZKWatcherSpan =
@@ -178,6 +153,7 @@ public void testZKWatcherHMaster() {
   public void testHMasterShutdown() {
     final Matcher<SpanData> masterShutdownMatcher = allOf(hasName("HMaster.shutdown"),
       hasParentSpanId(NO_PARENT_ID), hasStatusWithCode(isOneOf(StatusCode.OK, StatusCode.ERROR)));
+
     assertThat("there should be a span from the HMaster.shutdown.", spans,
       hasItem(masterShutdownMatcher));
     final SpanData masterShutdownSpan = spans.stream().filter(masterShutdownMatcher::matches)
@@ -193,6 +169,7 @@ public void testHMasterExitingMainLoop() {
     final Matcher<SpanData> masterExitingMainLoopMatcher =
       allOf(hasName("HMaster exiting main loop"), hasParentSpanId(NO_PARENT_ID),
         hasStatusWithCode(isOneOf(StatusCode.OK, StatusCode.ERROR)));
+
     assertThat("there should be a span from the HMaster exiting main loop.", spans,
       hasItem(masterExitingMainLoopMatcher));
     final SpanData masterExitingMainLoopSpan = spans.stream()
@@ -212,6 +189,7 @@ public void testTryRegionServerReport() {
     final Matcher<SpanData> tryRegionServerReportMatcher =
       allOf(hasName("HRegionServer.tryRegionServerReport"), hasParentSpanId(NO_PARENT_ID),
         hasStatusWithCode(isOneOf(StatusCode.OK, StatusCode.ERROR)));
+
     assertThat("there should be a span for the region server sending a report.", spans,
       hasItem(tryRegionServerReportMatcher));
     final SpanData tryRegionServerReportSpan = spans.stream()
@@ -226,6 +204,7 @@ spans, hasItem(allOf(hasName(endsWith("RegionServerStatusService/RegionServerRep
   public void testHRegionServerStartup() {
     final Matcher<SpanData> regionServerStartupMatcher = allOf(hasName("HRegionServer.startup"),
       hasParentSpanId(NO_PARENT_ID), hasStatusWithCode(isOneOf(StatusCode.OK, StatusCode.ERROR)));
+
     assertThat("there should be a span from the HRegionServer startup procedure.", spans,
       hasItem(regionServerStartupMatcher));
     final SpanData regionServerStartupSpan = spans.stream()
@@ -239,6 +218,7 @@ public void testHRegionServerStartup() {
   public void testHRegionServerConstructor() {
     final Matcher<SpanData> rsConstructorMatcher = allOf(hasName("HRegionServer.cxtor"),
       hasParentSpanId(NO_PARENT_ID), hasStatusWithCode(isOneOf(StatusCode.OK, StatusCode.ERROR)));
+
     assertThat("there should be a span from the HRegionServer constructor.", spans,
       hasItem(rsConstructorMatcher));
     final SpanData rsConstructorSpan = spans.stream().filter(rsConstructorMatcher::matches)
@@ -256,6 +236,7 @@ public void testHRegionServerPreRegistrationInitialization() {
     final Matcher<SpanData> rsPreRegistrationInitializationMatcher =
       allOf(hasName("HRegionServer.preRegistrationInitialization"), hasParentSpanId(NO_PARENT_ID),
         hasStatusWithCode(isOneOf(StatusCode.OK, StatusCode.ERROR)));
+
     assertThat("there should be a span from the HRegionServer preRegistrationInitialization.",
       spans, hasItem(rsPreRegistrationInitializationMatcher));
     final SpanData rsPreRegistrationInitializationSpan =
@@ -272,6 +253,7 @@ public void testHRegionServerRegisterWithMaster() {
     final Matcher<SpanData> rsRegisterWithMasterMatcher =
       allOf(hasName("HRegionServer.registerWithMaster"), hasParentSpanId(NO_PARENT_ID),
         hasStatusWithCode(isOneOf(StatusCode.OK, StatusCode.ERROR)));
+
     assertThat("there should be a span from the HRegionServer registerWithMaster.", spans,
       hasItem(rsRegisterWithMasterMatcher));
     final SpanData rsRegisterWithMasterSpan = spans.stream()
@@ -291,6 +273,7 @@ public void testZKWatcherRegionServer() {
     final Matcher<SpanData> rsZKWatcherMatcher =
       allOf(hasName(startsWith("ZKWatcher-regionserver")), hasParentSpanId(NO_PARENT_ID),
         hasStatusWithCode(isOneOf(StatusCode.OK, StatusCode.ERROR)));
+
     assertThat("there should be a span from the ZKWatcher running in the HRegionServer.", spans,
       hasItem(rsZKWatcherMatcher));
     final SpanData rsZKWatcherSpan =
@@ -304,6 +287,7 @@ public void testHRegionServerExitingMainLoop() {
     final Matcher<SpanData> rsExitingMainLoopMatcher =
       allOf(hasName("HRegionServer exiting main loop"), hasParentSpanId(NO_PARENT_ID),
         hasStatusWithCode(isOneOf(StatusCode.OK, StatusCode.ERROR)));
+
     assertThat("there should be a span from the HRegionServer exiting main loop.", spans,
       hasItem(rsExitingMainLoopMatcher));
     final SpanData rsExitingMainLoopSpan = spans.stream().filter(rsExitingMainLoopMatcher::matches)
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerMetrics.java
index 8dfb8b1a4632..2d08870bad48 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerMetrics.java
@@ -17,27 +17,23 @@
  */
 package org.apache.hadoop.hbase;
 
-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.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hbase.thirdparty.com.google.protobuf.ByteString;
 
 import org.apache.hadoop.hbase.shaded.protobuf.generated.ClusterStatusProtos;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;
 
-@Category({ MiscTests.class, SmallTests.class })
+@Tag(MiscTests.TAG)
+@Tag(SmallTests.TAG)
 public class TestServerMetrics {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestServerMetrics.class);
-
   @Test
   public void testRegionLoadAggregation() {
     ServerMetrics metrics = ServerMetricsBuilder
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
index 6ac87ce03026..93b9c5d97b65 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
@@ -17,9 +17,9 @@
  */
 package org.apache.hadoop.hbase;
 
-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.IOException;
 import java.util.ArrayList;
@@ -42,23 +42,18 @@
 import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Category(LargeTests.class)
+@Tag(LargeTests.TAG)
 public class TestServerSideScanMetricsFromClientSide {
   private static final Logger LOG =
     LoggerFactory.getLogger(TestServerSideScanMetricsFromClientSide.class);
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestServerSideScanMetricsFromClientSide.class);
-
   private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
 
   private static Table TABLE = null;
@@ -92,7 +87,7 @@ public class TestServerSideScanMetricsFromClientSide {
   // getCellHeapSize().
   private static long CELL_HEAP_SIZE = -1;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpBeforeClass() throws Exception {
     TEST_UTIL.startMiniCluster(3);
     TABLE = createTestTable(TABLE_NAME, ROWS, FAMILIES, QUALIFIERS, VALUE);
@@ -107,7 +102,7 @@ private static Table createTestTable(TableName name, byte[][] rows, byte[][] fam
     return ht;
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownAfterClass() throws Exception {
     TEST_UTIL.shutdownMiniCluster();
   }
@@ -351,7 +346,7 @@ private void testMetric(Scan scan, String metricKey, long expectedValue) throws
 
   private void testMetric(Scan scan, String metricKey, long expectedValue,
     CompareOperator compareOperator) throws Exception {
-    assertTrue("Scan should be configured to record metrics", scan.isScanMetricsEnabled());
+    assertTrue(scan.isScanMetricsEnabled(), "Scan should be configured to record metrics");
     ResultScanner scanner = TABLE.getScanner(scan);
     // Iterate through all the results
     while (scanner.next() != null) {
@@ -359,17 +354,15 @@ private void testMetric(Scan scan, String metricKey, long expectedValue,
     }
     scanner.close();
     ScanMetrics metrics = scanner.getScanMetrics();
-    assertNotNull("Metrics are null", metrics);
-    assertTrue("Metric : " + metricKey + " does not exist", metrics.hasCounter(metricKey));
+    assertNotNull(metrics, "Metrics are null");
+    assertTrue(metrics.hasCounter(metricKey), "Metric : " + metricKey + " does not exist");
     final long actualMetricValue = metrics.getCounter(metricKey).get();
     if (compareOperator == CompareOperator.EQUAL) {
-      assertEquals(
-        "Metric: " + metricKey + " Expected: " + expectedValue + " Actual: " + actualMetricValue,
-        expectedValue, actualMetricValue);
+      assertEquals(expectedValue, actualMetricValue,
+        "Metric: " + metricKey + " Expected: " + expectedValue + " Actual: " + actualMetricValue);
     } else {
-      assertTrue(
-        "Metric: " + metricKey + " Expected: > " + expectedValue + " Actual: " + actualMetricValue,
-        actualMetricValue > expectedValue);
+      assertTrue(actualMetricValue > expectedValue,
+        "Metric: " + metricKey + " Expected: > " + expectedValue + " Actual: " + actualMetricValue);
     }
   }
 }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSize.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSize.java
index 2103b720dcc2..fffbdd204695 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSize.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSize.java
@@ -17,22 +17,19 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Set;
 import java.util.TreeSet;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
-@Category({ MiscTests.class, SmallTests.class })
+@Tag(MiscTests.TAG)
+@Tag(SmallTests.TAG)
 public class TestSize {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE = HBaseClassTestRule.forClass(TestSize.class);
-
   @Test
   public void testConversion() {
     Size kbSize = new Size(1024D, Size.Unit.MEGABYTE);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java
index 915a28856293..22c39629d1ec 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java
@@ -17,9 +17,9 @@
  */
 package org.apache.hadoop.hbase;
 
-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.List;
 import java.util.concurrent.TimeUnit;
@@ -33,29 +33,25 @@
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestSplitMerge {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestSplitMerge.class);
-
   private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() throws Exception {
     UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_META_OPERATION_TIMEOUT, 1000);
     UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 2);
     UTIL.startMiniCluster(1);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() throws Exception {
     UTIL.shutdownMiniCluster();
   }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMergeQuotaTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMergeQuotaTable.java
index 8954311fca25..8a8973de075d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMergeQuotaTable.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMergeQuotaTable.java
@@ -17,11 +17,12 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.client.AsyncAdmin;
 import org.apache.hadoop.hbase.client.RegionInfo;
@@ -29,70 +30,61 @@
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.ExternalResource;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TestRule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.params.provider.Arguments;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.hbase.thirdparty.com.google.common.collect.ImmutableMap;
+
 /**
  * Test that we can split and merge the quota table given the presence of various configuration
  * settings.
  */
-@Category({ MiscTests.class, LargeTests.class })
-@RunWith(Parameterized.class)
+@Tag(MiscTests.TAG)
+@Tag(LargeTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: configMap = {0}")
 public class TestSplitMergeQuotaTable {
 
   private static final Logger LOG = LoggerFactory.getLogger(TestSplitMergeQuotaTable.class);
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestSplitMergeQuotaTable.class);
-
-  @Parameterized.Parameters(name = "{1}")
-  public static Object[][] params() {
-    return new Object[][] { { Map.of(QuotaUtil.QUOTA_CONF_KEY, "false") },
-      { Map.of(QuotaUtil.QUOTA_CONF_KEY, "true") }, };
+  public static Stream<Arguments> parameters() {
+    return Stream.of(Arguments.of(ImmutableMap.of(QuotaUtil.QUOTA_CONF_KEY, "false")),
+      Arguments.of(ImmutableMap.of(QuotaUtil.QUOTA_CONF_KEY, "true")));
   }
 
+  private final HBaseTestingUtil util = new HBaseTestingUtil();
+
   private final TableName tableName = QuotaUtil.QUOTA_TABLE_NAME;
-  private final MiniClusterRule miniClusterRule;
 
-  @Rule
-  public final RuleChain ruleChain;
+  private Map<String, String> configMap;
 
   public TestSplitMergeQuotaTable(Map<String, String> configMap) {
-    this.miniClusterRule = MiniClusterRule.newBuilder().setConfiguration(() -> {
-      Configuration conf = HBaseConfiguration.create();
-      conf.setInt(HConstants.HBASE_CLIENT_META_OPERATION_TIMEOUT, 1000);
-      conf.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 2);
-      configMap.forEach(conf::set);
-      return conf;
-    }).build();
-    TestRule ensureQuotaTableRule = new ExternalResource() {
-      @Override
-      protected void before() throws Throwable {
-        if (
-          !miniClusterRule.getTestingUtility().getAsyncConnection().getAdmin()
-            .tableExists(QuotaUtil.QUOTA_TABLE_NAME).get(30, TimeUnit.SECONDS)
-        ) {
-          miniClusterRule.getTestingUtility().getHBaseCluster().getMaster()
-            .createSystemTable(QuotaUtil.QUOTA_TABLE_DESC);
-        }
-      }
-    };
-    this.ruleChain = RuleChain.outerRule(miniClusterRule).around(ensureQuotaTableRule);
+    this.configMap = configMap;
+  }
+
+  @BeforeEach
+  public void setUp() throws Exception {
+    Configuration conf = util.getConfiguration();
+    conf.setInt(HConstants.HBASE_CLIENT_META_OPERATION_TIMEOUT, 1000);
+    conf.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 2);
+    configMap.forEach(conf::set);
+    util.startMiniCluster();
+    if (!util.getAdmin().tableExists(QuotaUtil.QUOTA_TABLE_NAME)) {
+      util.getHBaseCluster().getMaster().createSystemTable(QuotaUtil.QUOTA_TABLE_DESC);
+    }
+  }
+
+  @AfterEach
+  public void tearDown() throws Exception {
+    util.shutdownMiniCluster();
   }
 
-  @Test
+  @TestTemplate
   public void testSplitMerge() throws Exception {
-    HBaseTestingUtil util = miniClusterRule.getTestingUtility();
     util.waitTableAvailable(tableName, 30_000);
     AsyncAdmin admin = util.getAsyncConnection().getAdmin();
     admin.split(tableName, Bytes.toBytes(0x10)).get(30, TimeUnit.SECONDS);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestTagRewriteCell.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestTagRewriteCell.java
index 228cb66c00a9..e61af6821abf 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestTagRewriteCell.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestTagRewriteCell.java
@@ -17,22 +17,17 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.hadoop.hbase.io.HeapSize;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
-@Category(SmallTests.class)
+@Tag(SmallTests.TAG)
 public class TestTagRewriteCell {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestTagRewriteCell.class);
-
   @Test
   public void testHeapSize() {
     ExtendedCell originalCell = ExtendedCellBuilderFactory.create(CellBuilderType.DEEP_COPY)
@@ -50,11 +45,10 @@ public void testHeapSize() {
     // VisibilityController and AccessController)
     ExtendedCell trCell2 = PrivateCellUtil.createCell(trCell, new byte[fakeTagArrayLength]);
 
-    assertTrue(
+    assertTrue(trCellHeapSize < ((HeapSize) trCell2).heapSize(),
       "TagRewriteCell containing a TagRewriteCell's heapsize should be "
-        + "larger than a single TagRewriteCell's heapsize",
-      trCellHeapSize < ((HeapSize) trCell2).heapSize());
-    assertTrue("TagRewriteCell should have had nulled out tags array",
-      ((HeapSize) trCell).heapSize() < trCellHeapSize);
+        + "larger than a single TagRewriteCell's heapsize");
+    assertTrue(((HeapSize) trCell).heapSize() < trCellHeapSize,
+      "TagRewriteCell should have had nulled out tags array");
   }
 }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
index dd53373ab5ef..fc5822477937 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
@@ -17,9 +17,9 @@
  */
 package org.apache.hadoop.hbase;
 
-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 edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.List;
@@ -46,33 +46,25 @@
 import org.apache.hadoop.hbase.zookeeper.ZKUtil;
 import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
 import org.apache.zookeeper.KeeperException;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Category({ MiscTests.class, MediumTests.class })
+@Tag(MiscTests.TAG)
+@Tag(MediumTests.TAG)
 public class TestZooKeeper {
 
-  @ClassRule
-  public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(TestZooKeeper.class);
-
   private static final Logger LOG = LoggerFactory.getLogger(TestZooKeeper.class);
 
   private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
 
-  @Rule
-  public TestName name = new TestName();
-
-  @BeforeClass
+  @BeforeAll
   public static void setUpBeforeClass() throws Exception {
     // Test we can first start the ZK cluster by itself
     Configuration conf = TEST_UTIL.getConfiguration();
@@ -86,19 +78,19 @@ public static void setUpBeforeClass() throws Exception {
     TEST_UTIL.startMiniDFSCluster(2);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownAfterClass() throws Exception {
     TEST_UTIL.shutdownMiniCluster();
   }
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     StartTestingClusterOption option =
       StartTestingClusterOption.builder().numMasters(2).numRegionServers(2).build();
     TEST_UTIL.startMiniHBaseCluster(option);
   }
 
-  @After
+  @AfterEach
   public void after() throws Exception {
     try {
       TEST_UTIL.getHBaseCluster().waitForActiveAndReadyMaster(10000);
@@ -116,17 +108,17 @@ public void after() throws Exception {
   }
 
   @Test
-  public void testRegionServerSessionExpired() throws Exception {
-    LOG.info("Starting " + name.getMethodName());
+  public void testRegionServerSessionExpired(TestInfo testInfo) throws Exception {
+    LOG.info("Starting " + testInfo.getTestMethod().get().getName());
     TEST_UTIL.expireRegionServerSession(0);
-    testSanity(name.getMethodName());
+    testSanity(testInfo.getTestMethod().get().getName());
   }
 
   @Test
-  public void testMasterSessionExpired() throws Exception {
-    LOG.info("Starting " + name.getMethodName());
+  public void testMasterSessionExpired(TestInfo testInfo) throws Exception {
+    LOG.info("Starting " + testInfo.getTestMethod().get().getName());
     TEST_UTIL.expireMasterSession();
-    testSanity(name.getMethodName());
+    testSanity(testInfo.getTestMethod().get().getName());
   }
 
   /**
@@ -134,13 +126,13 @@ public void testMasterSessionExpired() throws Exception {
    * {@link #testMasterSessionExpired} because here the master znode will exist in ZK.
    */
   @Test
-  public void testMasterZKSessionRecoveryFailure() throws Exception {
-    LOG.info("Starting " + name.getMethodName());
+  public void testMasterZKSessionRecoveryFailure(TestInfo testInfo) throws Exception {
+    LOG.info("Starting " + testInfo.getTestMethod().get().getName());
     SingleProcessHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
     HMaster m = cluster.getMaster();
     m.abort("Test recovery from zk session expired", new KeeperException.SessionExpiredException());
     assertTrue(m.isStopped()); // Master doesn't recover any more
-    testSanity(name.getMethodName());
+    testSanity(testInfo.getTestMethod().get().getName());
   }
 
   /**
@@ -172,7 +164,8 @@ private void testSanity(final String testName) throws Exception {
    * calling retainAssignment.
    */
   @Test
-  public void testRegionAssignmentAfterMasterRecoveryDueToZKExpiry() throws Exception {
+  public void testRegionAssignmentAfterMasterRecoveryDueToZKExpiry(TestInfo testInfo)
+    throws Exception {
     SingleProcessHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
     cluster.startRegionServer();
     cluster.waitForActiveAndReadyMaster(10000);
@@ -183,9 +176,9 @@ public void testRegionAssignmentAfterMasterRecoveryDueToZKExpiry() throws Except
       byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes("a"), Bytes.toBytes("b"),
         Bytes.toBytes("c"), Bytes.toBytes("d"), Bytes.toBytes("e"), Bytes.toBytes("f"),
         Bytes.toBytes("g"), Bytes.toBytes("h"), Bytes.toBytes("i"), Bytes.toBytes("j") };
-      TableDescriptor htd =
-        TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))
-          .setColumnFamily(ColumnFamilyDescriptorBuilder.of(HConstants.CATALOG_FAMILY)).build();
+      TableDescriptor htd = TableDescriptorBuilder
+        .newBuilder(TableName.valueOf(testInfo.getTestMethod().get().getName()))
+        .setColumnFamily(ColumnFamilyDescriptorBuilder.of(HConstants.CATALOG_FAMILY)).build();
       admin.createTable(htd, SPLIT_KEYS);
       TEST_UTIL.waitUntilNoRegionsInTransition(60000);
       m.getZooKeeper().close();
@@ -202,7 +195,7 @@ public void testRegionAssignmentAfterMasterRecoveryDueToZKExpiry() throws Except
 
       // The recovered master should not call retainAssignment, as it is not a
       // clean startup.
-      assertFalse("Retain assignment should not be called", MockLoadBalancer.retainAssignCalled);
+      assertFalse(MockLoadBalancer.retainAssignCalled, "Retain assignment should not be called");
       // number of listeners should be same as the value before master aborted
       // wait for new master is initialized
       cluster.waitForActiveAndReadyMaster(120000);
@@ -244,10 +237,10 @@ private int countListeners(ZKWatcher watcher, Class<?>... exclude) {
    * RS goes down.
    */
   @Test
-  public void testLogSplittingAfterMasterRecoveryDueToZKExpiry() throws Exception {
+  public void testLogSplittingAfterMasterRecoveryDueToZKExpiry(TestInfo testInfo) throws Exception {
     SingleProcessHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
     cluster.startRegionServer();
-    TableName tableName = TableName.valueOf(name.getMethodName());
+    TableName tableName = TableName.valueOf(testInfo.getTestMethod().get().getName());
     byte[] family = Bytes.toBytes("col");
     try (Admin admin = TEST_UTIL.getAdmin()) {
       byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes("1"), Bytes.toBytes("2"),
@@ -278,7 +271,7 @@ public void testLogSplittingAfterMasterRecoveryDueToZKExpiry() throws Exception
           numberOfRows++;
         }
       }
-      assertEquals("Number of rows should be equal to number of puts.", numberOfPuts, numberOfRows);
+      assertEquals(numberOfPuts, numberOfRows, "Number of rows should be equal to number of puts.");
     }
   }
 
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TimestampTestBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TimestampTestBase.java
index 60052e1718e9..5f13ec274e11 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TimestampTestBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TimestampTestBase.java
@@ -27,7 +27,7 @@
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 
 /**
  * Tests user specifiable time stamps putting, getting and scanning. Also tests same in presence of
@@ -104,9 +104,9 @@ private static void assertOnlyLatest(final Table incommon, final long currentTim
     get.addColumn(FAMILY_NAME, QUALIFIER_NAME);
     get.readVersions(3);
     Result result = incommon.get(get);
-    Assert.assertEquals(1, result.size());
+    Assertions.assertEquals(1, result.size());
     long time = Bytes.toLong(CellUtil.cloneValue(result.rawCells()[0]));
-    Assert.assertEquals(time, currentTime);
+    Assertions.assertEquals(time, currentTime);
   }
 
   /*
@@ -122,7 +122,7 @@ public static void assertVersions(final Table incommon, final long[] tss) throws
     Result r = incommon.get(get);
     byte[] bytes = r.getValue(FAMILY_NAME, QUALIFIER_NAME);
     long t = Bytes.toLong(bytes);
-    Assert.assertEquals(tss[0], t);
+    Assertions.assertEquals(tss[0], t);
 
     // Now assert that if we ask for multiple versions, that they come out in
     // order.
@@ -131,10 +131,10 @@ public static void assertVersions(final Table incommon, final long[] tss) throws
     get.readVersions(tss.length);
     Result result = incommon.get(get);
     Cell[] kvs = result.rawCells();
-    Assert.assertEquals(kvs.length, tss.length);
+    Assertions.assertEquals(kvs.length, tss.length);
     for (int i = 0; i < kvs.length; i++) {
       t = Bytes.toLong(CellUtil.cloneValue(kvs[i]));
-      Assert.assertEquals(tss[i], t);
+      Assertions.assertEquals(tss[i], t);
     }
 
     // Determine highest stamp to set as next max stamp
@@ -147,10 +147,10 @@ public static void assertVersions(final Table incommon, final long[] tss) throws
     get.readVersions(kvs.length - 1);
     result = incommon.get(get);
     kvs = result.rawCells();
-    Assert.assertEquals(kvs.length, tss.length - 1);
+    Assertions.assertEquals(kvs.length, tss.length - 1);
     for (int i = 1; i < kvs.length; i++) {
       t = Bytes.toLong(CellUtil.cloneValue(kvs[i - 1]));
-      Assert.assertEquals(tss[i], t);
+      Assertions.assertEquals(tss[i], t);
     }
 
     // Test scanner returns expected version
@@ -169,12 +169,12 @@ public static void doTestTimestampScanning(final Table incommon, final FlushCach
     // Get count of latest items.
     int count = assertScanContentTimestamp(incommon, HConstants.LATEST_TIMESTAMP);
     // Assert I get same count when I scan at each timestamp.
-    Assert.assertEquals(count, assertScanContentTimestamp(incommon, T0));
-    Assert.assertEquals(count, assertScanContentTimestamp(incommon, T1));
+    Assertions.assertEquals(count, assertScanContentTimestamp(incommon, T0));
+    Assertions.assertEquals(count, assertScanContentTimestamp(incommon, T1));
     // Flush everything out to disk and then retry
     flusher.flushcache();
-    Assert.assertEquals(count, assertScanContentTimestamp(incommon, T0));
-    Assert.assertEquals(count, assertScanContentTimestamp(incommon, T1));
+    Assertions.assertEquals(count, assertScanContentTimestamp(incommon, T0));
+    Assertions.assertEquals(count, assertScanContentTimestamp(incommon, T1));
   }
 
   /*