diff --git a/plans/smoke.fmf b/plans/smoke.fmf
index 474ed15..a1e7bfd 100644
--- a/plans/smoke.fmf
+++ b/plans/smoke.fmf
@@ -1,15 +1,5 @@
 summary: Basic smoke test
 discover:
-  how: shell
-  tests:
-    - name: /smoke/forktest
-      test: |
-        set -x
-        cd ./plans/forktest
-        javac -d target/test-classes ForkTest.java
-        xmvn -V -e -B -o surefire:test
-prepare:
-  how: install
-  package: xmvn-minimal
+  how: fmf
 execute:
   how: tmt
diff --git a/tests/Regression/bz1981486-fork/main.fmf b/tests/Regression/bz1981486-fork/main.fmf
new file mode 100644
index 0000000..fc04955
--- /dev/null
+++ b/tests/Regression/bz1981486-fork/main.fmf
@@ -0,0 +1,9 @@
+summary: rhbz#1981486 regression test for maven-surefire
+description: |
+  Regression test for https://bugzilla.redhat.com/show_bug.cgi?id=1981486.
+  Ensure that maven-surefire can execute forked JVM.
+require:
+  - maven-surefire-plugin
+  - maven-surefire-provider-junit
+  - maven-compiler-plugin
+  - xmvn-minimal
diff --git a/plans/forktest/pom.xml b/tests/Regression/bz1981486-fork/pom.xml
similarity index 100%
rename from plans/forktest/pom.xml
rename to tests/Regression/bz1981486-fork/pom.xml
diff --git a/tests/Regression/bz1981486-fork/runtest.sh b/tests/Regression/bz1981486-fork/runtest.sh
new file mode 100755
index 0000000..2152613
--- /dev/null
+++ b/tests/Regression/bz1981486-fork/runtest.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# Author: Mikolaj Izdebski <mizdebsk@redhat.com>
+. /usr/share/beakerlib/beakerlib.sh
+
+rlJournalStart
+
+  rlPhaseStartTest "compile and run surefire tests"
+    rlRun -s "xmvn -V -e -B -o compiler:testCompile surefire:test"
+    rlAssertGrep "Running ForkTest" $rlRun_LOG
+    rlAssertGrep "Tests run: 1, Failures: 0, Errors: 0, Skipped: 0" $rlRun_LOG
+    rlAssertGrep "BUILD SUCCESS" $rlRun_LOG
+  rlPhaseEnd
+
+rlJournalEnd
+rlJournalPrintText
diff --git a/plans/forktest/ForkTest.java b/tests/Regression/bz1981486-fork/src/test/java/ForkTest.java
similarity index 100%
rename from plans/forktest/ForkTest.java
rename to tests/Regression/bz1981486-fork/src/test/java/ForkTest.java
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