diff --git a/podman.spec b/podman.spec
index c399db5..fed9c45 100644
--- a/podman.spec
+++ b/podman.spec
@@ -29,7 +29,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 Epoch: 2
 Name: podman
 Version: 3.4.5
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -402,6 +402,13 @@ exit 0
 %{_libexecdir}/%{name}/gvproxy
 
 %changelog
+* Thu Dec 09 2021 Jindrich Novy <jnovy@redhat.com> - 2:3.4.5-0.2
+- incorporate gating test fixes from Ed Santiago:
+  - remove buildah and skopeo (unused)
+  - bump BATS from v1.1 to v1.5
+  - rename "nonroot" to "rootless"
+- Related: #2000051
+
 * Thu Dec 09 2021 Jindrich Novy <jnovy@redhat.com> - 2:3.4.5-0.1
 - update to the latest content of https://github.com/containers/podman/tree/v3.4
   (https://github.com/containers/podman/commit/b8fde5c)
diff --git a/tests/roles/bats_installed/tasks/main.yml b/tests/roles/bats_installed/tasks/main.yml
index 242d444..00010b6 100644
--- a/tests/roles/bats_installed/tasks/main.yml
+++ b/tests/roles/bats_installed/tasks/main.yml
@@ -2,11 +2,11 @@
 # Sigh; RHEL8 doesn't have BATS
 - name: bats | fetch and unpack tarball
   unarchive:
-    src: https://github.com/bats-core/bats-core/archive/v1.1.0.tar.gz
+    src: https://github.com/bats-core/bats-core/archive/v1.5.0.tar.gz
     dest: /root
     remote_src: true
 
 - name: bats | install
   command: ./install.sh /usr/local
   args:
-    chdir: /root/bats-core-1.1.0
+    chdir: /root/bats-core-1.5.0
diff --git a/tests/roles/nonroot_user/tasks/main.yml b/tests/roles/nonroot_user/tasks/main.yml
deleted file mode 100644
index 51bf44a..0000000
--- a/tests/roles/nonroot_user/tasks/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: create nonroot user
-  user:
-    name: testuser
-    shell: /bin/bash
-- name: enable linger
-  command: loginctl enable-linger testuser
diff --git a/tests/roles/run_bats_tests/files/helper.buildah-root.sh b/tests/roles/run_bats_tests/files/helper.buildah-root.sh
deleted file mode 100644
index 2bfe083..0000000
--- a/tests/roles/run_bats_tests/files/helper.buildah-root.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-#
-# setup and teardown helpers for buildah test
-#
-
-function setup() {
-    REGISTRY_FQIN=quay.io/libpod/registry:2
-
-    AUTHDIR=/tmp/buildah-tests-auth.$$
-    mkdir -p $AUTHDIR
-
-    CERT=$AUTHDIR/domain.crt
-    if [ ! -e $CERT ]; then
-        openssl req -newkey rsa:4096 -nodes -sha256 \
-                -keyout $AUTHDIR/domain.key -x509 -days 2 \
-                -out $AUTHDIR/domain.crt \
-                -subj "/C=US/ST=Foo/L=Bar/O=Red Hat, Inc./CN=localhost"
-    fi
-
-    if [ ! -e $AUTHDIR/htpasswd ]; then
-        podman run --rm --entrypoint htpasswd $REGISTRY_FQIN \
-               -Bbn testuser testpassword > $AUTHDIR/htpasswd
-    fi
-
-    podman run -d -p 5000:5000 \
-           --name registry \
-           -v $AUTHDIR:/auth:Z \
-           -e "REGISTRY_AUTH=htpasswd" \
-           -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm" \
-           -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd \
-           -e REGISTRY_HTTP_TLS_CERTIFICATE=/auth/domain.crt \
-           -e REGISTRY_HTTP_TLS_KEY=/auth/domain.key \
-           $REGISTRY_FQIN
-}
-
-function teardown() {
-    podman rm -f registry
-}
diff --git a/tests/tests.yml b/tests/tests.yml
index f5db5db..8a81cdb 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -5,7 +5,7 @@
   - artifacts: ./artifacts
   roles:
   - role: bats_installed
-  - role: nonroot_user
+  - role: rootless_user
   - role: run_bats_tests
     tests:
     - name:    podman root
@@ -13,7 +13,7 @@
       environment:
         PODMAN: /usr/bin/podman
 
-    - name:    podman nonroot
+    - name:    podman rootless
       package: podman
       environment:
         PODMAN: /usr/bin/podman
@@ -23,14 +23,3 @@
       #package: podman
       #environment:
       #  PODMAN: /usr/bin/podman-remote
-
-    - name:    buildah root
-      package: buildah
-      environment:
-        BUILDAH_BINARY: /usr/bin/buildah
-        IMGTYPE_BINARY: /usr/bin/buildah-imgtype
-
-    - name:    skopeo root
-      package: skopeo
-      environment:
-        SKOPEO_BINARY: /usr/bin/skopeo