diff --git a/plans/smoke.fmf b/plans/smoke.fmf
index c206167..14cc1f9 100644
--- a/plans/smoke.fmf
+++ b/plans/smoke.fmf
@@ -1,10 +1,6 @@
 summary: Basic smoke test
 discover:
-  how: shell
-  tests:
-    - name: /smoke/help
-      test: |
-        python3 /usr/share/java-utils/mvn_build.py --help
+  how: fmf
 prepare:
   how: install
   exclude:
diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf
new file mode 100644
index 0000000..1b9de9b
--- /dev/null
+++ b/tests/Sanity/smoke/main.fmf
@@ -0,0 +1,5 @@
+summary: javapackages-tools smoke test
+description: |
+  Test basic functionality of javapackages-tools.
+require:
+  - maven-local
diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh
new file mode 100755
index 0000000..9f98558
--- /dev/null
+++ b/tests/Sanity/smoke/runtest.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+# Author: Mikolaj Izdebski <mizdebsk@redhat.com>
+. /usr/share/beakerlib/beakerlib.sh
+
+rlJournalStart
+
+  rlPhaseStartTest "check for presence of javapackages-tools commands"
+    rlAssertRpm javapackages-tools
+    rlAssertBinaryOrigin build-classpath javapackages-tools
+    rlAssertBinaryOrigin build-classpath-directory javapackages-tools
+    rlAssertBinaryOrigin build-jar-repository javapackages-tools
+    rlAssertBinaryOrigin check-binary-files javapackages-tools
+    rlAssertBinaryOrigin clean-binary-files javapackages-tools
+    rlAssertBinaryOrigin create-jar-links javapackages-tools
+    rlAssertBinaryOrigin diff-jars javapackages-tools
+    rlAssertBinaryOrigin find-jar javapackages-tools
+    rlAssertBinaryOrigin rebuild-jar-repository javapackages-tools
+    rlAssertBinaryOrigin shade-jar javapackages-tools
+  rlPhaseEnd
+
+  rlPhaseStartTest "display mvn_build help"
+    rlRun -s "python3 /usr/share/java-utils/mvn_build.py --help"
+    rlAssertGrep "Usage: mvn_build.py" $rlRun_LOG
+    rlAssertGrep "Skip javadoc generation and installation" $rlRun_LOG
+  rlPhaseEnd
+
+rlJournalEnd
+rlJournalPrintText
diff --git a/tests/main.fmf b/tests/main.fmf
new file mode 100644
index 0000000..99fd67e
--- /dev/null
+++ b/tests/main.fmf
@@ -0,0 +1,4 @@
+contact: Mikolaj Izdebski <mizdebsk@redhat.com>
+framework: beakerlib
+test: ./runtest.sh
+tier: 0