diff --git a/plans/matrix.fmf b/plans/matrix.fmf
index bb328ff..8d4c145 100644
--- a/plans/matrix.fmf
+++ b/plans/matrix.fmf
@@ -16,12 +16,12 @@ execute:
   /full:
     summary: Maven matrix tests - OpenJDK 17 full
     discover+:
-      filter: tag:jdk17
+      filter: tag:jdk17 & tier:0,1
 
   /headless:
     summary: Maven matrix tests - OpenJDK 17 headless
     discover+:
-      filter: tag:jre17
+      filter: tag:jre17 & tier:0,1
     environment+:
       OPENJDK_HEADLESS: "true"
     prepare+:
@@ -40,12 +40,12 @@ execute:
   /full:
     summary: Maven matrix tests - OpenJDK 21 full
     discover+:
-      filter: tag:jdk21
+      filter: tag:jdk21 & tier:0,1
 
   /headless:
     summary: Maven matrix tests - OpenJDK 21 headless
     discover+:
-      filter: tag:jre21
+      filter: tag:jre21 & tier:0,1
     environment+:
       OPENJDK_HEADLESS: "true"
     prepare+: