diff --git a/Containerfile.alpine b/Containerfile.alpine
index eeb2d94..6a727f3 100644
--- a/Containerfile.alpine
+++ b/Containerfile.alpine
@@ -3,7 +3,7 @@ WORKDIR /build
 RUN apk add git make gcc libc-dev musl-dev glib-static gettext eudev-dev \
 	linux-headers automake autoconf cmake meson ninja clang go-md2man
 
-RUN git clone https://github.com/libfuse/libfuse && \
+RUN git clone https://github.com/libfuse/libfuse -b fuse-3.16.2 && \
     cd libfuse && \
     mkdir build && \
     cd build && \
diff --git a/Containerfile.static.fedora b/Containerfile.static.fedora
index 51cde87..9f9dfc7 100644
--- a/Containerfile.static.fedora
+++ b/Containerfile.static.fedora
@@ -3,7 +3,7 @@ WORKDIR /build
 RUN dnf update -y && \
     dnf install -y git make automake autoconf gcc glibc-static meson ninja-build clang
 
-RUN git clone https://github.com/libfuse/libfuse && \
+RUN git clone https://github.com/libfuse/libfuse -b fuse-3.16.2 && \
     cd libfuse && \
     mkdir build && \
     cd build && \
diff --git a/tests/fedora-installs.sh b/tests/fedora-installs.sh
index c59d9b3..8a30fdf 100755
--- a/tests/fedora-installs.sh
+++ b/tests/fedora-installs.sh
@@ -45,17 +45,10 @@ umount merged
 rm -rf workdir lower upper
 mkdir upper workdir lower
 
-fuse-overlayfs -o sync=0,lowerdir=lower,upperdir=upper,workdir=workdir,suid,dev merged
-
-# https://github.com/containers/fuse-overlayfs/issues/86
-docker run --rm -v $(pwd)/merged:/merged quay.io/centos/centos:stream8 yum --installroot /merged -y --releasever 8 install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
-
-umount merged
-
 # fast_ino_check
 fuse-overlayfs -o fast_ino_check=1,sync=0,lowerdir=lower,upperdir=upper,workdir=workdir,suid,dev merged
 
-docker run --rm -v $(pwd)/merged:/merged quay.io/centos/centos:stream8 yum --installroot /merged -y --releasever 8 install nano
+docker run --rm -v $(pwd)/merged:/merged fedora dnf --installroot /merged --releasever 30 install -y glibc-common gedit
 
 mkdir merged/a-directory