diff --git a/Makefile.am b/Makefile.am
index a4c59fe7fb..800ebcbc81 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -240,8 +240,14 @@ BUILT_SOURCES = .version git-version.h
 
 CLEANFILES = crun.spec .version git-version.h $(LUACRUN_ROCKSPEC)
 
+man1_MANS =
+
 if ENABLE_CRUN
-man1_MANS = crun.1 krun.1
+man1_MANS += crun.1
+endif
+
+if ENABLE_KRUN
+man1_MANS += krun.1
 endif
 
 crun.1: $(abs_srcdir)/crun.1.md
diff --git a/configure.ac b/configure.ac
index 36245ee812..870f0bed07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,10 @@ AS_IF([test "x$with_wasmedge" = "xyes"], AC_CHECK_HEADERS([wasmedge/wasmedge.h],
 dnl include support for libkrun (EXPERIMENTAL)
 AC_ARG_WITH([libkrun], AS_HELP_STRING([--with-libkrun], [build with libkrun support]))
 AS_IF([test "x$with_libkrun" = "xyes"], AC_CHECK_HEADERS([libkrun.h], AC_DEFINE([HAVE_LIBKRUN], 1, [Define if libkrun is available]), [AC_MSG_ERROR([*** Missing libkrun headers])]))
+
+AM_CONDITIONAL([ENABLE_KRUN], [test "x$with_libkrun" = xyes])
+
+
 dnl libseccomp
 AC_ARG_ENABLE([seccomp],
 	AS_HELP_STRING([--disable-seccomp], [Ignore libseccomp and disable support]))
diff --git a/rpm/crun.spec b/rpm/crun.spec
index 2eed52b6c9..d3182b8a32 100644
--- a/rpm/crun.spec
+++ b/rpm/crun.spec
@@ -117,9 +117,6 @@ rm -rf %{buildroot}%{_prefix}/lib*
 
 %if %{defined krun_support}
 ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun
-%else
-# remove krun man page if krun not supported
-rm -f %{buildroot}%{_mandir}/man1/krun.1
 %endif
 
 %if %{defined wasm_support}
diff --git a/tests/podman/run-tests.sh b/tests/podman/run-tests.sh
index 149f318a65..93e98aba7d 100755
--- a/tests/podman/run-tests.sh
+++ b/tests/podman/run-tests.sh
@@ -5,7 +5,8 @@ if test "$(id -u)" != 0; then
 	exit 1
 fi
 
-set -e
+set -xeuo pipefail
+
 (
 cd /crun
 git config --global --add safe.directory /crun
@@ -16,9 +17,13 @@ make -j "$(nproc)"
 make install
 )
 
+uname -a
+cat /proc/self/mountinfo
+
 export OCI_RUNTIME=/usr/bin/crun
 export CGROUP_MANAGER=cgroupfs
-export STORAGE_OPTIONS="--storage-driver=vfs"
+export STORAGE_OPTIONS="--storage-driver=overlay"
+export STORAGE_FS="overlay"
 
 export GO111MODULE=off
 
@@ -37,13 +42,11 @@ export TMPDIR=/var/tmp
 # - notify_socket
 #
 # - podman run exit 12*|podman run exit code on failure to exec|failed to start
-#   assumption that "create" must fail if the executable is not found.  We must add lookup for the executable in $PATH to mimic the runc behavior.
 #   device-cgroup-rule|capabilities|network|overlay volume flag|prune removes a pod with a stopped container: not working on github actions
 #
 # - Podman run with specified static IPv6 has correct IP
 #   Does not work inside test environment.
 
-
-ginkgo --focus='.*' --skip='.*(selinux|notify_socket|systemd|podman run exit 12*|podman run exit code on failure to exec|failed to start|search|trust|inspect|logs|generate|import|mounted rw|inherit host devices|play kube|cgroups=disabled|privileged CapEff|device-cgroup-rule|capabilities|network|pull from docker|--add-host|removes a pod with a container|prune removes a pod with a stopped container|overlay volume flag|prune unused images|podman images filter|image list filter|create --pull|podman ps json format|using journald for container|image tree|--pull|shared layers|child images|cached images|flag with multiple mounts|overlay and used as workdir|image_copy_tmp_dir|Podman run with specified static IPv6 has correct IP|authenticated push|pod create --share-parent|podman kill paused container|login and logout|podman top on privileged container|local registry with authorization|podman update container all options v2|push test|uidmapping and gidmapping with a volume|uidmapping and gidmapping with an idmapped volume|Podman kube play).*' \
-	 -v -tags "seccomp ostree selinux varlink exclude_graphdriver_devicemapper" \
-	 -timeout=50m -cover -flakeAttempts 3 -progress -trace -noColor test/e2e/.
+ginkgo --focus='.*' --skip='.*(selinux|notify_socket|systemd|podman run exit 12*|podman run exit code on failure to exec|failed to start|search|trust|inspect|logs|generate|import|mounted rw|inherit host devices|play kube|cgroups=disabled|privileged CapEff|device-cgroup-rule|capabilities|network|pull from docker|--add-host|removes a pod with a container|prune removes a pod with a stopped container|overlay volume flag|prune unused images|podman images filter|image list filter|create --pull|podman ps json format|using journald for container|image tree|--pull|shared layers|child images|cached images|flag with multiple mounts|overlay and used as workdir|image_copy_tmp_dir|Podman run with specified static IPv6 has correct IP|authenticated push|pod create --share-parent|podman kill paused container|login and logout|podman top on privileged container|local registry with authorization|podman update container all options v2|push test|podman pull and run on split imagestore|Podman kube play|uidmapping and gidmapping).*' \
+	 -vv -tags "seccomp ostree selinux exclude_graphdriver_devicemapper" \
+	 -timeout=50m -cover -flake-attempts 3 -progress -trace -no-color test/e2e/.