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
index e49fcf1..6e93959 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,7 +1,16 @@
-# recipients: jnovy, lsm5, santiago
 --- !Policy
 product_versions:
-  - rhel-9
+  - fedora-*
+decision_context:
+  - bodhi_update_push_stable
+  - bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+--- !Policy
+product_versions:
+  - rhel-*
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/plans/main.fmf b/plans/main.fmf
new file mode 100644
index 0000000..baa8b2f
--- /dev/null
+++ b/plans/main.fmf
@@ -0,0 +1,20 @@
+discover:
+    how: fmf
+execute:
+    how: tmt
+prepare:
+    - when: distro == centos-stream or distro == rhel
+      how: shell
+      script: |
+        dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm
+        dnf -y config-manager --set-enabled epel
+      order: 10
+    - when: initiator == packit
+      how: shell
+      script: |
+        COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo"
+        if compgen -G $COPR_REPO_FILE > /dev/null; then
+            sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE
+        fi
+        dnf -y upgrade --allowerasing
+      order: 20
diff --git a/skopeo.spec b/skopeo.spec
index 505d187..65c9574 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -66,10 +66,7 @@ registries without the need to pull them
 Summary: Tests for %{name}
 
 Requires: %{name} = %{epoch}:%{version}-%{release}
-%if %{defined fedora}
 Requires: bats
-Requires: fakeroot
-%endif
 Requires: gnupg
 Requires: jq
 Requires: golang
@@ -82,7 +79,8 @@ Requires: squashfs-tools
 %description tests
 %{summary}
 
-This package contains system tests for %{name}
+This package contains system tests for %{name}. Only intended for distro gating
+tests. End user / customer usage not supported.
 
 %prep
 %if 0%{?branch:1}
diff --git a/test/tmt/main.fmf b/test/tmt/main.fmf
new file mode 100644
index 0000000..e7cfe38
--- /dev/null
+++ b/test/tmt/main.fmf
@@ -0,0 +1,10 @@
+require:
+    - bats
+    - skopeo-tests
+
+environment:
+    SKOPEO_BINARY: /usr/bin/skopeo
+
+summary: System test
+test: bash ./test.sh
+duration: 60m
diff --git a/test/tmt/test.sh b/test/tmt/test.sh
new file mode 100644
index 0000000..7c80eba
--- /dev/null
+++ b/test/tmt/test.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -exo pipefail
+
+uname -r
+
+rpm -q \
+    bats \
+    containers-common \
+    skopeo \
+    skopeo-tests \
+
+bats /usr/share/skopeo/test/system
diff --git a/tests/roles/bats_installed/tasks/main.yml b/tests/roles/bats_installed/tasks/main.yml
deleted file mode 100644
index 20a73f3..0000000
--- a/tests/roles/bats_installed/tasks/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# Sigh; RHEL8 doesn't have BATS
-- name: bats | fetch and unpack tarball
-  unarchive:
-    src: https://github.com/bats-core/bats-core/archive/v1.9.0.tar.gz
-    dest: /root
-    remote_src: true
-
-- name: bats | install
-  command: ./install.sh /usr/local
-  args:
-    chdir: /root/bats-core-1.9.0
diff --git a/tests/test_skopeo.sh b/tests/test_skopeo.sh
deleted file mode 100755
index 561b3fb..0000000
--- a/tests/test_skopeo.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash -e
-
-# Log program and kernel versions
-echo "Important package versions:"
-(
-    uname -r
-    rpm -qa | egrep 'skopeo|podman|conmon|crun|runc|iptable|slirp|systemd' | sort
-) | sed -e 's/^/  /'
-
-# Log environment; or at least the useful bits
-echo "Environment:"
-env | grep -v LS_COLORS= | sort | sed -e 's/^/  /'
-
-SKOPEO_BINARY=/usr/bin/skopeo bats /usr/share/skopeo/test/system
diff --git a/tests/test_skopeo.yml b/tests/test_skopeo.yml
deleted file mode 100644
index 065f31f..0000000
--- a/tests/test_skopeo.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- hosts: localhost
-  tags: classic
-  roles:
-    - role: bats_installed
-    - role: standard-test-basic
-      tags:
-        - classic
-        - container
-      required_packages:
-        - skopeo
-        - skopeo-tests
-      tests:
-        - root-test:
-            dir: ./
-            run: ./test_skopeo.sh
-            timeout: 15m
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index aa28816..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1 +0,0 @@
-- import_playbook: test_skopeo.yml