diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..c5aa0e0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/plans/smoke-jdk11.fmf b/plans/smoke-jdk11.fmf
deleted file mode 100644
index 4ad3c5f..0000000
--- a/plans/smoke-jdk11.fmf
+++ /dev/null
@@ -1,8 +0,0 @@
-summary: Basic smoke test - OpenJDK 11
-prepare:
-  how: install
-  exclude:
-    - maven-openjdk8
-    - maven-openjdk17
-execute:
-  script: 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 1200458..0000000
--- a/plans/smoke-jdk17.fmf
+++ /dev/null
@@ -1,8 +0,0 @@
-summary: Basic smoke test - OpenJDK 17
-prepare:
-  how: install
-  exclude:
-    - maven-openjdk8
-    - maven-openjdk11
-execute:
-  script: 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 c83338c..0000000
--- a/plans/smoke-jdk8.fmf
+++ /dev/null
@@ -1,8 +0,0 @@
-summary: Basic smoke test - OpenJDK 8
-prepare:
-  how: install
-  exclude:
-    - maven-openjdk11
-    - maven-openjdk17
-execute:
-  script: 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..73c96c9
--- /dev/null
+++ b/plans/smoke.fmf
@@ -0,0 +1,41 @@
+discover:
+  how: shell
+  tests:
+    - name: /smoke/ensure-single-jdk
+      test: "! rpm -qa | grep ^java- | grep -v ^java-${JDK_VERSION}-openjdk-"
+    - name: /smoke/show-version
+      test: mvn -v
+    - name: /smoke/dependency-get
+      test: rm -rf $HOME/.m2 && mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar
+prepare:
+  how: install
+  exclude:
+    - maven-openjdk8
+    - maven-openjdk11
+    - maven-openjdk17
+execute:
+  how: tmt
+
+/jdk8:
+  summary: Basic smoke tests (OpenJDK 8)
+  environment:
+    JDK_VERSION: 1.8.0
+  prepare+:
+    exclude-:
+      - maven-openjdk8
+
+/jdk11:
+  summary: Basic smoke tests (OpenJDK 11)
+  environment:
+    JDK_VERSION: 11
+  prepare+:
+    exclude-:
+      - maven-openjdk11
+
+/jdk17:
+  summary: Basic smoke tests (OpenJDK 17)
+  environment:
+    JDK_VERSION: 17
+  prepare+:
+    exclude-:
+      - maven-openjdk17