diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..c5aa0e0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index 05d1cc5..7b6e38f 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -5,4 +5,5 @@ decision_contexts:
   - bodhi_update_push_testing
   - bodhi_update_push_stable
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.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/smoke.fmf b/plans/smoke.fmf
new file mode 100644
index 0000000..ce42085
--- /dev/null
+++ b/plans/smoke.fmf
@@ -0,0 +1,12 @@
+summary: Basic smoke test
+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