diff --git a/test/vm.install b/test/vm.install
index ebebfd99..b75a9525 100755
--- a/test/vm.install
+++ b/test/vm.install
@@ -17,10 +17,6 @@ if ! rpm -q beakerlib; then
     fi
 fi
 
-if ! rpm -q podman-docker; then
-    yum install -y podman-docker
-fi
-
 if ! rpm -q git; then
     yum install -y git
 fi
@@ -44,3 +40,11 @@ rpm -e --verbose $(basename -a ${packages[@]} | sed 's/-[0-9].*.rpm$//') || true
 yum install -y $packages
 
 systemctl enable lorax-composer.socket
+
+if [ -f /usr/bin/docker ]; then
+    yum remove -y $(rpm -qf /usr/bin/docker)
+fi
+
+if ! rpm -q podman-docker; then
+    yum install -y podman-docker
+fi
diff --git a/tests/cli/test_compose_tar.sh b/tests/cli/test_compose_tar.sh
index 2de3542d..2b56c46e 100755
--- a/tests/cli/test_compose_tar.sh
+++ b/tests/cli/test_compose_tar.sh
@@ -30,14 +30,6 @@ rlJournalStart
 
     rlPhaseStartTest "compose finished"
         wait_for_compose $UUID
-
-        # Running a compose can lead to a different selinux policy in the
-        # kernel, which may break docker. Reload the policy from the host and
-        # restart docker as a workaround.
-        # See https://bugzilla.redhat.com/show_bug.cgi?id=1711813
-        semodule -R
-        systemctl restart docker
-
         rlRun -t -c "$CLI compose image $UUID"
         IMAGE="$UUID-root.tar.xz"
     rlPhaseEnd