diff --git a/plans/matrix.fmf b/plans/matrix.fmf
new file mode 100644
index 0000000..c22a670
--- /dev/null
+++ b/plans/matrix.fmf
@@ -0,0 +1,110 @@
+discover:
+  how: fmf
+  url: https://src.fedoraproject.org/tests/ant
+
+execute:
+  how: tmt
+
+/jdk8:
+  environment:
+    OPENJDK_VERSION: 1.8.0
+  prepare:
+    - how: install
+      exclude:
+        - ant-openjdk11
+        - ant-openjdk17
+        - ant-openjdk21
+
+  /full:
+    summary: Ant matrix tests - OpenJDK 8 full
+    discover+:
+      filter: tag:jdk8 & tier:0,1
+
+  /headless:
+    summary: Ant matrix tests - OpenJDK 8 headless
+    discover+:
+      filter: tag:jre8 & tier:0,1
+    environment+:
+      OPENJDK_HEADLESS: "true"
+    prepare+:
+      - how: shell
+        script: |
+          dnf -y remove java-*-openjdk
+
+/jdk11:
+  environment:
+    OPENJDK_VERSION: 11
+  prepare:
+    - how: install
+      exclude:
+        - ant-openjdk8
+        - ant-openjdk17
+        - ant-openjdk21
+
+  /full:
+    summary: Ant matrix tests - OpenJDK 11 full
+    discover+:
+      filter: tag:jdk11 & tier:0,1
+
+  /headless:
+    summary: Ant matrix tests - OpenJDK 11 headless
+    discover+:
+      filter: tag:jre11 & tier:0,1
+    environment+:
+      OPENJDK_HEADLESS: "true"
+    prepare+:
+      - how: shell
+        script: |
+          dnf -y remove java-*-openjdk
+
+/jdk17:
+  environment:
+    OPENJDK_VERSION: 17
+  prepare:
+    - how: install
+      exclude:
+        - ant-openjdk8
+        - ant-openjdk11
+        - ant-openjdk21
+
+  /full:
+    summary: Ant matrix tests - OpenJDK 17 full
+    discover+:
+      filter: tag:jdk17 & tier:0,1
+
+  /headless:
+    summary: Ant matrix tests - OpenJDK 17 headless
+    discover+:
+      filter: tag:jre17 & tier:0,1
+    environment+:
+      OPENJDK_HEADLESS: "true"
+    prepare+:
+      - how: shell
+        script: |
+          dnf -y remove java-*-openjdk
+
+/jdk21:
+  environment:
+    OPENJDK_VERSION: 21
+  prepare:
+    - how: install
+      exclude:
+        - ant-openjdk8
+        - ant-openjdk11
+        - ant-openjdk17
+
+  /full:
+    summary: Ant matrix tests - OpenJDK 21 full
+    discover+:
+      filter: tag:jdk21 & tier:0,1
+
+  /headless:
+    summary: Ant matrix tests - OpenJDK 21 headless
+    discover+:
+      filter: tag:jre21 & tier:0,1
+    environment+:
+      OPENJDK_HEADLESS: "true"
+    prepare+:
+      - how: shell
+        script: |
+          dnf -y remove java-*-openjdk
diff --git a/plans/smoke.fmf b/plans/smoke.fmf
deleted file mode 100644
index 2bf1be8..0000000
--- a/plans/smoke.fmf
+++ /dev/null
@@ -1,52 +0,0 @@
-discover:
-  how: fmf
-  # FIXME
-  # url: https://src.fedoraproject.org/tests/ant
-  url: https://src.fedoraproject.org/forks/mkoncek/tests/ant
-
-execute:
-  how: tmt
-
-/jdk8:
-  summary: Basic smoke tests (OpenJDK 8)
-  environment:
-    OPENJDK_VERSION: "1.8.0"
-  prepare:
-    - how: install
-      exclude:
-        - ant-openjdk11
-        - ant-openjdk17
-        - ant-openjdk21
-
-/jdk11:
-  summary: Basic smoke tests (OpenJDK 11)
-  environment:
-    OPENJDK_VERSION: "11"
-  prepare:
-    - how: install
-      exclude:
-        - ant-openjdk8
-        - ant-openjdk17
-        - ant-openjdk21
-
-/jdk17:
-  summary: Basic smoke tests (OpenJDK 17)
-  environment:
-    OPENJDK_VERSION: "17"
-  prepare:
-    - how: install
-      exclude:
-        - ant-openjdk8
-        - ant-openjdk11
-        - ant-openjdk21
-
-/jdk21:
-  summary: Basic smoke tests (OpenJDK 21)
-  environment:
-    OPENJDK_VERSION: "21"
-  prepare:
-    - how: install
-      exclude:
-        - ant-openjdk8
-        - ant-openjdk11
-        - ant-openjdk17