diff --git a/playbooks/setup-env.yaml b/playbooks/setup-env.yaml
index 7ac9b46ee..f04331adf 100644
--- a/playbooks/setup-env.yaml
+++ b/playbooks/setup-env.yaml
@@ -26,14 +26,8 @@
       args:
         chdir: '{{ zuul.project.src_dir }}'
 
-    - name: Setup environment
-      become: yes
-      command:
-        cmd: systemd-tmpfiles --create
-        creates: /run/media
-
     - name: Check versions of crucial packages
-      command: rpm -qa *kernel* *glibc* golang podman conmon containernetworking-plugins containers-common container-selinux crun runc fuse-overlayfs flatpak-session-helper
+      command: rpm -qa *kernel* *glibc* golang podman conmon containernetworking-plugins containers-common container-selinux crun runc fuse-overlayfs flatpak-session-helper patchelf
 
     - name: Show podman versions
       command: podman version
diff --git a/playbooks/system-test.yaml b/playbooks/system-test.yaml
index c2eff3f0d..39d3c2cf5 100644
--- a/playbooks/system-test.yaml
+++ b/playbooks/system-test.yaml
@@ -23,6 +23,13 @@
         chdir: '{{ zuul.project.src_dir }}'
         creates: '{{ toolbox_bin }}'
 
+    - name: Setup environment
+      become: yes
+      command:
+        cmd: systemd-tmpfiles --create
+        creates: /run/media
+        creates: /run/host
+
     - name: Run system tests
       command: bats --timing ./test/system
       environment:
diff --git a/playbooks/unit-test.yaml b/playbooks/unit-test.yaml
index 9be98e7bd..58f442957 100644
--- a/playbooks/unit-test.yaml
+++ b/playbooks/unit-test.yaml
@@ -9,6 +9,7 @@
           - golang-github-cpuguy83-md2man
           - ninja-build
           - meson
+          - patchelf
           - ShellCheck
 
     - name: Set up build directory