diff --git a/tests/atlocal.in b/tests/atlocal.in
index e31d3ccead..00b3f971dc 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -5,7 +5,7 @@ HAVE_UNSHARE=@HAVE_UNSHARE@
 PYTHON=@PYTHON@
 PGP=@PGP@
 
-RPMTREE=${RPMTREE:-/}
+RPMTREE=/srv/blah-rpm:/srv/blah-img
 RPMTEST=/
 RPMDATA="/data/"
 
diff --git a/tests/mktree.oci b/tests/mktree.oci
index dd762f8d21..2e283bbcef 100755
--- a/tests/mktree.oci
+++ b/tests/mktree.oci
@@ -49,13 +49,17 @@ rpmtests()
     fi
 
     source ./snapshot
+    mkdir -p $PWD/blah-img
+    chcon -Rt container_file_t $PWD
+    mount --bind $(podman image mount rpm/base) $PWD/blah-img
     RPMTREE=$PWD/blah-rpm:$PWD/blah-img
     RPMTEST=$PWD/blah-mnt
-    chcon -Rt container_file_t $PWD
     snapshot mount
     $PODMAN run --privileged -it --read-only --tmpfs /tmp -v $vol \
                 --workdir /srv $opts --rootfs $RPMTEST rpmtests "$@"
     snapshot umount
+    umount $PWD/blah-img
+    podman image umount rpm/base
 }
 
 unshared()
@@ -69,8 +73,8 @@ case $CMD in
     build) unshared
         if [ $NATIVE == yes ]; then
             # Native build
-            $PODMAN build --target base -o $PWD/blah-img $ARGS
-            chmod -Rf u+rwX $PWD/blah-img
+            $PODMAN build --target base -t rpm/base $ARGS
+            # chmod -Rf u+rwX $PWD/blah-img
             make_install $PWD/blah-rpm
         else
             # Standalone build