diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index def0914..ec45f1f 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -1,5 +1,4 @@
-summary:
-    Run javapackages-specific tests
+summary: Run javapackages-specific tests
 discover:
     how: fmf
     url: https://pagure.io/javapackages-validator-tests
diff --git a/plans/smoke.fmf b/plans/smoke.fmf
index ce42085..fa03fc2 100644
--- a/plans/smoke.fmf
+++ b/plans/smoke.fmf
@@ -1,12 +1,24 @@
 summary: Basic smoke test
+discover:
+  how: shell
+  tests:
+    - name: /smoke/maven-version
+      test: /usr/libexec/javapackages-bootstrap/mvn --version
+    - name: /smoke/maven-home-version
+      test: /usr/share/javapackages-bootstrap/bin/mvn --version
+    - name: /smoke/xmvn-version
+      test: /usr/libexec/javapackages-bootstrap/xmvn --version
+    - name: /smoke/xmvn-install-help
+      test: /usr/libexec/javapackages-bootstrap/xmvn-install --help
+    - name: /smoke/xmvn-resolve-help
+      test: /usr/libexec/javapackages-bootstrap/xmvn-resolve --help
+    - name: /smoke/xmvn-subst-help
+      test: /usr/libexec/javapackages-bootstrap/xmvn-subst --help
+    - name: /smoke/ant-version
+      test: /usr/libexec/javapackages-bootstrap/ant -version
+    - name: /smoke/cup
+      test: echo 'non terminal bar; bar::=;' | /usr/libexec/javapackages-bootstrap/cup
+    - name: /smoke/jflex-version
+      test: /usr/libexec/javapackages-bootstrap/jflex -version
 execute:
-  script:
-    - /usr/libexec/javapackages-bootstrap/mvn --version
-    - /usr/share/javapackages-bootstrap/bin/mvn --version
-    - /usr/libexec/javapackages-bootstrap/xmvn --version
-    - /usr/libexec/javapackages-bootstrap/xmvn-install --help
-    - /usr/libexec/javapackages-bootstrap/xmvn-resolve --help
-    - /usr/libexec/javapackages-bootstrap/xmvn-subst --help
-    - /usr/libexec/javapackages-bootstrap/ant -version
-    - echo 'non terminal bar; bar::=;' | /usr/libexec/javapackages-bootstrap/cup
-    - /usr/libexec/javapackages-bootstrap/jflex -version
+  how: tmt