diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index 4ca9235..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/pesign.spec b/pesign.spec
index aff1b0c..d5840df 100644
--- a/pesign.spec
+++ b/pesign.spec
@@ -6,7 +6,7 @@
 Name:    pesign
 Summary: Signing utility for UEFI binaries
 Version: 116
-Release: 7%{?dist}.alma.1
+Release: 8%{?dist}.alma.1
 License: GPL-2.0-only
 URL:     https://github.com/rhboot/pesign
 
@@ -162,9 +162,13 @@ certutil -d %{_sysconfdir}/pki/pesign/ -X -L > /dev/null
 %{python3_sitelib}/mockbuild/plugins/pesign.*
 
 %changelog
-* Sat Jul 04 2026 Andrei Lukoshko <alukoshko@almalinux.org> - 116-7.alma.1
+* Thu Jul 09 2026 Andrei Lukoshko <alukoshko@almalinux.org> - 116-8.alma.1
 - Add versioned x86_64 arches support
 
+* Tue Jul 07 2026 Marta Lewandowska <mlewando@redhat.com> - 116-8
+- Move gating tests correctly to TF
+  Resolves: RHEL-190540
+
 * Tue Jun 30 2026 Marta Lewandowska <mlewando@redhat.com> - 116-7
 - Move gating tests to Testing Farm
   Resolves: RHEL-190540
diff --git a/plans/ci.fmf b/plans/ci.fmf
new file mode 100644
index 0000000..5e941ff
--- /dev/null
+++ b/plans/ci.fmf
@@ -0,0 +1,10 @@
+summary: pesign gating tests
+discover:
+    - name: kernel-tests
+      how: fmf
+      url: https://gitlab.com/redhat/centos-stream/tests/kernel/kernel-tests.git
+      ref: main
+      test:
+          - /misc/secureboot/pesign
+execute:
+    how: tmt