diff --git a/plans/smoke.fmf b/plans/smoke.fmf
index 2b088f0..921663f 100644
--- a/plans/smoke.fmf
+++ b/plans/smoke.fmf
@@ -1,13 +1,17 @@
 discover:
   how: fmf
-  url: https://src.fedoraproject.org/tests/maven
-
+  # FIXME
+  # url: https://src.fedoraproject.org/tests/maven
+  url: https://src.fedoraproject.org/forks/mkoncek/tests/maven
+environment:
+  # The commit just before adding a test for [MNG-8106] which fails with Maven 3.6
+  MAVEN_IT_GIT_COMMIT: 680cd976359e2141762b09ca06b82869d30d0cbc
 execute:
   how: tmt
 
 /jdk8:
-  environment:
-    OPENJDK_VERSION: 1.8.0
+  environment+:
+    OPENJDK_VERSION: "1.8.0"
   prepare:
     - how: install
       exclude:
@@ -17,21 +21,23 @@ execute:
 
   /full:
     summary: Basic smoke tests (OpenJDK 8 full)
+    discover+:
+      filter: tag:jdk8
 
   /headless:
     summary: Basic smoke tests (OpenJDK 8 headless)
     discover+:
-      filter: tag:-java-compiler
+      filter: tag:jre8
     environment+:
-      OPENJDK_HEADLESS: true
+      OPENJDK_HEADLESS: "true"
     prepare+:
       - how: shell
         script: |
           dnf -y erase java-*-openjdk
 
 /jdk11:
-  environment:
-    OPENJDK_VERSION: 11
+  environment+:
+    OPENJDK_VERSION: "11"
   prepare:
     - how: install
       exclude:
@@ -41,19 +47,23 @@ execute:
 
   /full:
     summary: Basic smoke tests (OpenJDK 11 full)
+    discover+:
+      filter: tag:jdk11
 
   /headless:
     summary: Basic smoke tests (OpenJDK 11 headless)
+    discover+:
+      filter: tag:jre11
     environment+:
-      OPENJDK_HEADLESS: true
+      OPENJDK_HEADLESS: "true"
     prepare+:
       - how: shell
         script: |
           dnf -y erase java-*-openjdk
 
 /jdk17:
-  environment:
-    OPENJDK_VERSION: 17
+  environment+:
+    OPENJDK_VERSION: "17"
   prepare:
     - how: install
       exclude:
@@ -63,19 +73,23 @@ execute:
 
   /full:
     summary: Basic smoke tests (OpenJDK 17 full)
+    discover+:
+      filter: tag:jdk17
 
   /headless:
     summary: Basic smoke tests (OpenJDK 17 headless)
+    discover+:
+      filter: tag:jre17
     environment+:
-      OPENJDK_HEADLESS: true
+      OPENJDK_HEADLESS: "true"
     prepare+:
       - how: shell
         script: |
           dnf -y erase java-*-openjdk
 
 /jdk21:
-  environment:
-    OPENJDK_VERSION: 21
+  environment+:
+    OPENJDK_VERSION: "21"
   prepare:
     - how: install
       exclude:
@@ -85,11 +99,15 @@ execute:
 
   /full:
     summary: Basic smoke tests (OpenJDK 21 full)
+    discover+:
+      filter: tag:jdk21
 
   /headless:
     summary: Basic smoke tests (OpenJDK 21 headless)
+    discover+:
+      filter: tag:jre21
     environment+:
-      OPENJDK_HEADLESS: true
+      OPENJDK_HEADLESS: "true"
     prepare+:
       - how: shell
         script: |