diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index fcd6631ceb3..7c48edcb105 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -21,6 +21,11 @@
 # questions.
 #
 
+# All tests
+
+all = \
+  :hotspot_all
+
 hotspot_all = \
   /
 
@@ -28,6 +33,8 @@ hotspot_all_no_apps = \
   / \
   -applications
 
+# Component test groups
+
 hotspot_compiler = \
   compiler
 
diff --git a/test/jaxp/TEST.groups b/test/jaxp/TEST.groups
index 0b67ed428b9..f8cb73c4393 100644
--- a/test/jaxp/TEST.groups
+++ b/test/jaxp/TEST.groups
@@ -20,6 +20,14 @@
 #  questions.
 #
 
+# All tests
+
+all = \
+    :jaxp_all
+
+jaxp_all = \
+    /
+
 # Tiered testing definitions
 
 # No jaxp tests are tier 1.
@@ -34,6 +42,3 @@ tier3 =
 
 # No tier 4 tests.
 tier4 =
-
-jaxp_all = \
-    javax/xml/jaxp
diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index d15b79ea91c..fa033bff12e 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -20,6 +20,17 @@
 #  questions.
 #
 
+###############################################################################
+#
+# All tests
+#
+
+all = \
+    :jdk_all
+
+jdk_all = \
+    /
+
 ###############################################################################
 #
 # Tiered testing definitions
diff --git a/test/langtools/TEST.groups b/test/langtools/TEST.groups
index 8e521a56e02..e1ffd5d530b 100644
--- a/test/langtools/TEST.groups
+++ b/test/langtools/TEST.groups
@@ -63,10 +63,13 @@ langtools_jdeps = \
     tools/all \
     tools/jdeps
 
+# All tests
+
+all = \
+    :langtools_all
+
 langtools_all = \
-    jdk \
-    lib \
-    tools
+    /
 
 # Tiered testing definitions
 
diff --git a/test/lib-test/TEST.groups b/test/lib-test/TEST.groups
index eb0c9b317ae..669f7c89e23 100644
--- a/test/lib-test/TEST.groups
+++ b/test/lib-test/TEST.groups
@@ -21,4 +21,15 @@
 # questions.
 #
 
-tier1 = .
+# All tests
+
+all = \
+    :all
+
+libtest_all = \
+    /
+
+# Tiered testing definitions
+
+tier1 = \
+    :all