diff --git a/plans/main.fmf b/plans/main.fmf
index 10bf493e1..b4690c9e1 100644
--- a/plans/main.fmf
+++ b/plans/main.fmf
@@ -3,14 +3,25 @@ discover:
 execute:
     how: tmt
 prepare:
-    - how: feature
-      epel: enabled
+    - when: distro == rhel
+      how: install
+      package: https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm
+      order: 5
+    - when: distro == centos-stream or distro == rhel
+      how: shell
+      script: dnf -y config-manager --set-enabled epel
+      order: 10
     - when: initiator == packit
-      because: "We need to test with updated packages from rhcontainerbot/podman-next copr"
       how: shell
       script: |
         sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo
         dnf -y upgrade --allowerasing
+      order: 20
+    - how: install
+      package:
+        - bats
+        - crun
+        - podman-tests
 
 /upstream:
     summary: Run crun specific Podman system tests on upstream PRs
diff --git a/tests/tmt/podman/system-test.fmf b/tests/tmt/podman/system-test.fmf
index 9beb3c9ac..1032f0774 100644
--- a/tests/tmt/podman/system-test.fmf
+++ b/tests/tmt/podman/system-test.fmf
@@ -1,10 +1,3 @@
-require:
-    - bats
-    - conmon
-    - crun
-    - make
-    - podman-tests
-
 adjust:
     duration: 10m
     when: arch == aarch64
diff --git a/tests/tmt/sanity/main.fmf b/tests/tmt/sanity/main.fmf
index f4303510a..6355ff63f 100644
--- a/tests/tmt/sanity/main.fmf
+++ b/tests/tmt/sanity/main.fmf
@@ -1,4 +1,3 @@
-require: [crun, podman]
 summary: Sanity test for crun
 tag: ['upstream', 'downstream']
 test: bash ./runtest.sh