diff --git a/gating.yaml b/gating.yaml
index 636273a..d75b5f9 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -9,4 +9,5 @@ rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk25/full.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk25/headless.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/unbound/jlink.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages/jdk21.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages/jdk25.functional}
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index 477c3b0..455678b 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -5,3 +5,13 @@ discover:
   ref: c10s
 execute:
   how: tmt
+/jdk21:
+  prepare:
+    - how: install
+      exclude:
+        - maven-openjdk25
+/jdk25:
+  prepare:
+    - how: install
+      exclude:
+        - maven-openjdk21