diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/ClassTestFinder.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/ClassTestFinder.java
index 1bc648aeb0b5..dc51187e3cf8 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/ClassTestFinder.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/ClassTestFinder.java
@@ -19,9 +19,11 @@
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.regex.Pattern;
-import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.Tag;
 import org.junit.runners.Suite;
 
 /**
@@ -46,6 +48,16 @@ public static Class<?>[] getCategoryAnnotations(Class<?> c) {
     return new Class<?>[0];
   }
 
+  public static String[] getTagAnnotations(Class<?> c) {
+    // TODO handle optional Tags annotation
+    Tag[] tags = c.getAnnotationsByType(Tag.class);
+    List<String> values = new ArrayList<>();
+    for (Tag tag : tags) {
+      values.add(tag.value());
+    }
+    return values.toArray(new String[values.size()]);
+  }
+
   /** Filters both test classes and anything in the hadoop-compat modules */
   public static class TestFileNameFilter implements FileNameFilter, ResourcePathFilter {
     private static final Pattern hadoopCompactRe = Pattern.compile("hbase-hadoop\\d?-compat");
@@ -92,7 +104,10 @@ private boolean isTestClass(Class<?> c) {
       }
 
       for (Method met : c.getMethods()) {
-        if (met.getAnnotation(Test.class) != null) {
+        if (
+          met.getAnnotation(org.junit.Test.class) != null
+            || met.getAnnotation(org.junit.jupiter.api.Test.class) != null
+        ) {
           return true;
         }
       }
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 3d3ca12bd82d..c2b007280b4f 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
@@ -45,11 +45,15 @@ public void checkClasses() throws Exception {
     List<Class<?>> badClasses = new java.util.ArrayList<>();
     ClassTestFinder classFinder = new ClassTestFinder();
     for (Class<?> c : classFinder.findClasses(false)) {
-      if (ClassTestFinder.getCategoryAnnotations(c).length == 0) {
+      if (
+        ClassTestFinder.getCategoryAnnotations(c).length == 0
+          && ClassTestFinder.getTagAnnotations(c).length == 0
+      ) {
         badClasses.add(c);
       }
     }
-    assertTrue("There are " + badClasses.size() + " test classes without category: " + badClasses,
+    assertTrue(
+      "There are " + badClasses.size() + " test classes without category and tag: " + badClasses,
       badClasses.isEmpty());
   }
 }