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 0c1cc35..116ac6c 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,7 +1,7 @@
 --- !Policy
 product_versions:
   - fedora-*
-decision_contexts: [bodhi_update_push_stable]
+decision_context: bodhi_update_push_stable
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/gating.functional}
diff --git a/plans/gating.fmf b/plans/gating.fmf
new file mode 100644
index 0000000..5ed0c31
--- /dev/null
+++ b/plans/gating.fmf
@@ -0,0 +1,6 @@
+summary: CI Gating Plan
+discover:
+    how: fmf
+    filter: tag:gating
+execute:
+    how: tmt
diff --git a/tests/Sanity/licence-check/main.fmf b/tests/Sanity/licence-check/main.fmf
index e80eb6d..163e41d 100644
--- a/tests/Sanity/licence-check/main.fmf
+++ b/tests/Sanity/licence-check/main.fmf
@@ -3,10 +3,6 @@ test: ./test.sh
 link:
   - relates: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1
   - relates: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2
-framework: beakerlib
-component:
-- python-jsonpointer
-contact: Jan Kuřík <jkurik@redhat.com>
 recommend:
 - python-jsonpointer
 - rpm-build
diff --git a/tests/main.fmf b/tests/main.fmf
new file mode 100644
index 0000000..11a0326
--- /dev/null
+++ b/tests/main.fmf
@@ -0,0 +1,3 @@
+contact: Jan Kuřík <jkurik@redhat.com>
+component: python-jsonpointer
+framework: beakerlib