diff --git a/tests/.fmf/version b/.fmf/version
similarity index 100%
rename from tests/.fmf/version
rename to .fmf/version
diff --git a/gating.yaml b/gating.yaml
index 648918d..d070991 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -3,4 +3,4 @@ product_versions:
   - rhel-9
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tests.functional}
diff --git a/plans/tests.fmf b/plans/tests.fmf
new file mode 100644
index 0000000..a536d4a
--- /dev/null
+++ b/plans/tests.fmf
@@ -0,0 +1,53 @@
+summary: libblockdev gating tests
+
+prepare:
+    how: install
+    package:
+      - cryptsetup
+      - device-mapper-multipath
+      - dosfstools
+      - e2fsprogs
+      - glibc-all-langpacks
+      - lvm2-dbusd
+      - mdadm
+      - ndctl
+      - nss-tools
+      - nvme-cli
+      - nvmetcli
+      - python3-bytesize
+      - python3-dbus
+      - python3-packaging
+      - python3-yaml
+      - smartmontools
+      - targetcli
+      - vdo
+      - volume_key
+      - xfsprogs
+
+discover:
+    how: shell
+    url: https://gitlab.com/redhat/centos-stream/rpms/libblockdev.git
+    ref: c9s
+    dist-git-source: true
+    dist-git-install-builddeps: true
+    tests:
+      - name: upstream test suite
+        test: |
+          set -x
+          if [ -z "$PKG_VER" ]; then
+              PKG_VER=`rpmspec -q --srpm --qf "%{version}" libblockdev.spec`
+          fi
+          if [ -z "$PKG_VER" ]; then
+              echo "Error: Unable to extract package version"
+              exit 1
+          fi
+          pushd $TMT_SOURCE_DIR/libblockdev-${PKG_VER}
+
+          python3 tests/run_tests.py --installed
+
+execute:
+  - how: tmt
+
+provision:
+  - hardware:
+      memory: ">= 3 GB"
diff --git a/tests/provision.fmf b/tests/provision.fmf
deleted file mode 100644
index a0c05cd..0000000
--- a/tests/provision.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-standard-inventory-qcow2:
-  qemu:
-    m: 3G
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index e899aa3..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-# No tests suitable for atomic environment
-# No tests suitable for container environment
-# Tests suitable for classic environment
-- hosts: localhost
-  roles:
-  - role: standard-test-source
-    tags:
-      - always
-
-  - role: standard-test-basic
-    tags:
-      - classic
-    tests:
-      - upstream_test_suite:
-          dir: source
-          run: python3 tests/run_tests.py --installed
-
-    required_packages:
-      - volume_key
-      - nss-tools
-      - targetcli
-      - xfsprogs
-      - dosfstools
-      - e2fsprogs
-      - cryptsetup
-      - glibc-all-langpacks
-      - python3-six
-      - python3-dbus
-      - python3-yaml
-      - python3-bytesize
-      - nvme-cli
-      - nvmetcli