diff --git a/plans/smoke.fmf b/plans/smoke.fmf
index 4ec7605..a1e7bfd 100644
--- a/plans/smoke.fmf
+++ b/plans/smoke.fmf
@@ -1,22 +1,5 @@
 summary: Basic smoke test
-prepare:
-  how: install
-  package:
-    - java-11-openjdk-devel
-    - xmvn-tools
-    - mvn(org.apache.ant:ant)
-    - mvn(jakarta.activation:jakarta.activation-api)
 discover:
-  how: shell
-  tests:
-    - name: /smoke/classpath-import
-      test: |
-        CLASSPATH+=":$(xmvn-resolve org.apache.ant:ant)"
-        CLASSPATH+=":$(xmvn-resolve jakarta.activation:jakarta.activation-api)"
-        CLASSPATH+=":$(xmvn-resolve com.sun.istack:istack-commons-runtime)"
-        CLASSPATH+=":$(xmvn-resolve com.sun.istack:istack-commons-tools)"
-        export CLASSPATH
-        /usr/lib/jvm/java-11-openjdk/bin/javac plans/Smoke.java
-        /usr/lib/jvm/java-11-openjdk/bin/java -cp "${CLASSPATH}:plans" Smoke
+  how: fmf
 execute:
   how: tmt
diff --git a/plans/Smoke.java b/tests/Sanity/smoke/Smoke.java
similarity index 100%
rename from plans/Smoke.java
rename to tests/Sanity/smoke/Smoke.java
diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf
new file mode 100644
index 0000000..4e1e185
--- /dev/null
+++ b/tests/Sanity/smoke/main.fmf
@@ -0,0 +1,9 @@
+summary: jaxb-istack-commons smoke test
+description: |
+  Test basic functionality of jaxb-istack-commons.
+require:
+  - jaxb-istack-commons-tools
+  - java-21-openjdk-devel
+  - xmvn-tools
+  - mvn(org.apache.ant:ant)
+  - mvn(jakarta.activation:jakarta.activation-api)
diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh
new file mode 100755
index 0000000..b5caed8
--- /dev/null
+++ b/tests/Sanity/smoke/runtest.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Author: Marian Koncek <mkoncek@redhat.com>
+. /usr/share/beakerlib/beakerlib.sh
+
+rlJournalStart
+
+  rlPhaseStartTest "compile Smoke.java and run it"
+    CLASSPATH+=":$(xmvn-resolve org.apache.ant:ant)"
+    CLASSPATH+=":$(xmvn-resolve jakarta.activation:jakarta.activation-api)"
+    CLASSPATH+=":$(xmvn-resolve com.sun.istack:istack-commons-runtime)"
+    CLASSPATH+=":$(xmvn-resolve com.sun.istack:istack-commons-tools)"
+    export CLASSPATH
+    rlRun "/usr/lib/jvm/java-21-openjdk/bin/javac Smoke.java"
+    rlRun -s "/usr/lib/jvm/java-21-openjdk/bin/java -cp \"${CLASSPATH}:plans\" Smoke"
+    rlAssertGrep "com.sun.istack.tools.ProtectedTask" $rlRun_LOG
+  rlPhaseEnd
+
+rlJournalEnd
+rlJournalPrintText
diff --git a/tests/main.fmf b/tests/main.fmf
new file mode 100644
index 0000000..90642fc
--- /dev/null
+++ b/tests/main.fmf
@@ -0,0 +1,5 @@
+contact: Marian Koncek <mkoncek@redhat.com>
+framework: beakerlib
+test: ./runtest.sh
+tier: 0
+component: jaxb-istack-commons