diff --git a/buildah.spec b/buildah.spec
index f4766c9..9dac202 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -89,6 +89,7 @@ Requires: bzip2
 Requires: podman
 Requires: golang
 Requires: jq
+Requires: httpd-tools
 
 %description tests
 %{summary}
diff --git a/tests/test_buildah.sh b/tests/test_buildah.sh
index 6a064be..860a4ba 100755
--- a/tests/test_buildah.sh
+++ b/tests/test_buildah.sh
@@ -19,7 +19,7 @@ export IMGTYPE_BINARY=/usr/bin/buildah-imgtype
 
 # Start a registry
 pre_bats_setup() {
-    REGISTRY_FQIN=docker.io/library/registry:2.6
+    REGISTRY_FQIN=docker.io/library/registry:2
 
     AUTHDIR=/tmp/buildah-tests-auth.$$
     mkdir -p $AUTHDIR
@@ -33,8 +33,7 @@ pre_bats_setup() {
     fi
 
     if [ ! -e $AUTHDIR/htpasswd ]; then
-        podman run --rm --entrypoint htpasswd $REGISTRY_FQIN \
-               -Bbn testuser testpassword > $AUTHDIR/htpasswd
+        htpasswd -Bbn testuser testpassword > $AUTHDIR/htpasswd
     fi
 
     podman rm -f registry || true