diff --git a/tests/integration/targets/connection/create-nonroot-user.yml b/tests/integration/targets/connection/create-nonroot-user.yml
new file mode 100644
index 0000000..6d9a45b
--- /dev/null
+++ b/tests/integration/targets/connection/create-nonroot-user.yml
@@ -0,0 +1,7 @@
+- hosts: "{{ target_hosts }}"
+  gather_facts: no
+  tasks:
+
+    - name: Create a user
+      user:
+        name: testuser
diff --git a/tests/integration/targets/connection_buildah/runme.sh b/tests/integration/targets/connection_buildah/runme.sh
index 8da6526..60b915c 100755
--- a/tests/integration/targets/connection_buildah/runme.sh
+++ b/tests/integration/targets/connection_buildah/runme.sh
@@ -12,11 +12,16 @@ function run_ansible {
 
 }
 
+# Issue in buildah: https://github.com/containers/buildah/issues/3126
+# Hack is from: https://github.com/containers/buildah/issues/3120#issuecomment-815889314
+# PR is merged here: https://github.com/containers/storage/pull/871
+export STORAGE_OPTS="overlay.mount_program=/usr/bin/fuse-overlayfs"
 # First run as root
 run_ansible "$@"
 
-# Create a normal user
-${SUDO:-} ansible all -i "test_connection.inventory" -m "user" -a 'name="testuser"'
+# Create a non-root user
+${SUDO:-} ${ANSIBLECMD:-ansible-playbook} -i "test_connection.inventory" ../connection/create-nonroot-user.yml \
+    -e target_hosts="buildah"
 
 # Second run as normal user
 ANSIBLE_VERBOSITY=4 ANSIBLE_REMOTE_USER="testuser" run_ansible "$@" | tee check_log