diff --git a/gating.yaml b/gating.yaml
index 09ecab3..7b6e38f 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -5,5 +5,5 @@ decision_contexts:
   - bodhi_update_push_testing
   - bodhi_update_push_stable
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/forktest.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional}
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}
diff --git a/plans/forktest.fmf b/plans/forktest.fmf
deleted file mode 100644
index fff85d9..0000000
--- a/plans/forktest.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Basic smoke test
-prepare:
-  how: install
-  package: xmvn-minimal
-execute:
-  script: |
-    set -x
-    cd ./plans/forktest
-    javac -d target/test-classes ForkTest.java
-    xmvn -V -e -B -o surefire:test
diff --git a/plans/smoke.fmf b/plans/smoke.fmf
new file mode 100644
index 0000000..5ac6c7b
--- /dev/null
+++ b/plans/smoke.fmf
@@ -0,0 +1,13 @@
+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