diff --git a/plans/smoke-jdk11.fmf b/plans/smoke-jdk11.fmf
deleted file mode 100644
index afdd048..0000000
--- a/plans/smoke-jdk11.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-summary: Basic smoke test - OpenJDK 11
-execute:
-  script:
-    - dnf -y swap maven-jdk-binding maven-openjdk11
-    - mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar
diff --git a/plans/smoke-jdk17.fmf b/plans/smoke-jdk17.fmf
deleted file mode 100644
index 01c0d85..0000000
--- a/plans/smoke-jdk17.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-summary: Basic smoke test - OpenJDK 17
-execute:
-  script:
-    - dnf -y swap maven-jdk-binding maven-openjdk17
-    - mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar
diff --git a/plans/smoke-jdk8.fmf b/plans/smoke-jdk8.fmf
deleted file mode 100644
index 8e4baf4..0000000
--- a/plans/smoke-jdk8.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-summary: Basic smoke test - OpenJDK 8
-execute:
-  script:
-    - dnf -y swap maven-jdk-binding maven-openjdk8
-    - mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar
diff --git a/plans/smoke.fmf b/plans/smoke.fmf
new file mode 100644
index 0000000..84dfa0a
--- /dev/null
+++ b/plans/smoke.fmf
@@ -0,0 +1,63 @@
+discover:
+  how: fmf
+  url: https://github.com/mizdebsk/maven-tests
+
+prepare:
+  - how: shell
+    script: dnf -y swap maven-jdk-binding ${MAVEN_BINDING}
+
+execute:
+  how: tmt
+
+/jdk8:
+  environment:
+    OPENJDK_VERSION: 1.8.0
+    MAVEN_BINDING: maven-openjdk8
+
+  /full:
+    summary: Basic smoke tests (OpenJDK 8 full)
+
+  /headless:
+    summary: Basic smoke tests (OpenJDK 8 headless)
+    discover+:
+      filter: tag:-java-compiler
+    environment+:
+      OPENJDK_HEADLESS: true
+    prepare+:
+      - how: shell
+        script: |
+          dnf -y erase java-*-openjdk
+
+/jdk11:
+  environment:
+    OPENJDK_VERSION: 11
+    MAVEN_BINDING: maven-openjdk11
+
+  /full:
+    summary: Basic smoke tests (OpenJDK 11 full)
+
+  /headless:
+    summary: Basic smoke tests (OpenJDK 11 headless)
+    environment+:
+      OPENJDK_HEADLESS: true
+    prepare+:
+      - how: shell
+        script: |
+          dnf -y erase java-*-openjdk
+
+/jdk17:
+  environment:
+    OPENJDK_VERSION: 17
+    MAVEN_BINDING: maven-openjdk17
+
+  /full:
+    summary: Basic smoke tests (OpenJDK 17 full)
+
+  /headless:
+    summary: Basic smoke tests (OpenJDK 17 headless)
+    environment+:
+      OPENJDK_HEADLESS: true
+    prepare+:
+      - how: shell
+        script: |
+          dnf -y erase java-*-openjdk