diff --git a/bindep.txt b/bindep.txt
index 37ca1a8..177de44 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,7 +1,7 @@
 # This is a cross-platform list tracking distribution packages needed by tests;
 # see https://docs.openstack.org/infra/bindep/ for additional information.
 
-build-dep [platform:dpkg]
+build-essential [platform:dpkg]
 dnsmasq-base [platform:dpkg]
 ebtables [platform:dpkg]
 gcc [test platform:rpm]
@@ -16,15 +16,17 @@ libvirt-dev [platform:dpkg]
 libvirt-devel [platform:rpm]
 libxml2-dev [platform:dpkg]
 libxslt-dev [platform:dpkg]
-make [platform:centos-7]
+make [platform:centos-7 platform:centos-8]
 pkg-config [platform:dpkg]
-python3 [test platform:rpm !platform:centos-7]
+python3 [test platform:dpkg platform:rpm !platform:centos-7]
 python3-devel [test platform:rpm !platform:centos-7]
+python3-dev [test platform:dpkg]
 python3-libselinux [test platform:rpm !platform:centos-7]
 python3-libvirt [test platform:rpm !platform:centos-7 platform:dpkg]
 python3-netifaces [test !platform:centos-7 platform:rpm]
-python36 [test !platform:centos-7 !platform:fedora-28]
-qemu [platform:dpkg]
+python36 [test !platform:dpkg !platform:centos-7 !platform:fedora-28]
+qemu-system [platform:dpkg]
+qemu-utils [platform:dpkg]
 qemu-kvm [platform:rpm]
 ruby-dev [platform:dpkg]
 ruby-devel [!platform:centos-7 !platform:centos-8 platform:rpm]
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index bc9e0ca..08fc94f 100755
--- a/tools/test-setup.sh
+++ b/tools/test-setup.sh
@@ -16,13 +16,11 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 command -v python3 python
 
 PYTHON=$(command -v python3 python|head -n1)
-PKG_CMD=$(command -v dnf yum|head -n1)
+PKG_CMD=$(command -v dnf yum apt-get|head -n1)
 
 sudo $PYTHON -m pip install -U tox "zipp<0.6.0;python_version=='2.7'"
 
 # === LIBVIRT SETUP ===
-# https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1588004
-sudo rm -f /etc/systemd/libvirtd.service /etc/systemd/system/multi-user.target.wants/libvirt-bin.service || true
 sudo systemctl enable --now libvirtd
 sudo usermod --append --groups libvirt "$(whoami)"
 
@@ -32,15 +30,67 @@ sudo usermod --append --groups libvirt "$(whoami)"
 
 which vagrant || \
     sudo $PKG_CMD install -y vagrant-libvirt || {
-        sudo $PKG_CMD install -y https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.rpm
+        sudo $PKG_CMD install -y https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.rpm
     }
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1839651
-if [ -f /etc/fedora-release ]; then
-    grep -qi '^fedora.*31' /etc/fedora-release
-    if [ $? -eq 0 ]; then
-        sudo $PKG_CMD upgrade -y --enablerepo=updates-testing --advisory=FEDORA-2020-09c472786c
-    fi
+if [ -f /etc/os-release ]; then
+    source /etc/os-release
+    case "$NAME" in
+        Ubuntu)
+            case "$VERSION_ID" in
+                18.04)
+                    # ubuntu xenial vagrant is too old so it doesn't support triggers, used by the alpine box
+                    sudo apt-get remove --purge -y vagrant
+                    wget https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.deb
+                    sudo dpkg -i vagrant_2.2.9_x86_64.deb
+                    ;;
+                *)
+                    ;;
+            esac
+            ;;
+        Fedora)
+            case "$VERSION_ID" in
+                31)
+                    # https://bugzilla.redhat.com/show_bug.cgi?id=1839651
+                    sudo $PKG_CMD upgrade -y --enablerepo=updates-testing --advisory=FEDORA-2020-09c472786c
+                    ;;
+                *)
+                    ;;
+            esac
+            ;;
+        CentOS*)
+            # https://github.com/hashicorp/vagrant/issues/11020
+            if grep -qi '^CentOS Linux release 8.2.*' /etc/centos-release ; then
+                # https://bugs.centos.org/view.php?id=17120
+                relver="$(cat /etc/centos-release | awk '{print $4}')"
+                sudo sed -i /etc/yum.repos.d/CentOS-Sources.repo -e 's,$contentdir/,,g'
+                sudo sed -i /etc/yum.repos.d/CentOS-Sources.repo -e "s,\$releasever,$relver,g"
+
+                sudo dnf install -y rpm-build autoconf libselinux-devel pam-devel bison byacc
+                mkdir -p "$HOME/rpmbuild/SOURCES"
+                cd "$HOME/rpmbuild/SOURCES"
+                # download as root to avoid the "error: [Errno 13] Permission denied: '/var/cache/dnf/expired_repos.json'"
+                sudo dnf download --enablerepo=BaseOS-source --disablerepo=epel-source --disablerepo=epel --source krb5-libs
+                rpm2cpio krb5-1.17-*.src.rpm | cpio -idv
+                # remove patch making incompatible with the openssl bundled with vagrant
+                sed -i ./krb5.spec -e 's,Patch.*Use-backported-version-of-OpenSSL-3-KDF-interface.patch,,'
+                # depends on previous patch
+                sed -i ./krb5.spec -e 's,Patch.*krb5-1.17post2-DES-3DES-fixups.patch,,'
+                # not sure why but makes the build fail
+                sed -i ./krb5.spec -e 's,Patch.*krb5-1.17post6-FIPS-with-PRNG-and-RADIUS-and-MD4.patch,,'
+                rpmbuild -bp krb5.spec --nodeps
+                cd ../BUILD/krb5-1.17/src
+                # Some flags are missing compared to the spec but these ones seem to be enough
+                export CFLAGS="-I/opt/vagrant/embedded/include/ -fPIC -fno-strict-aliasing -fstack-protector-all"
+                export LDFLAGS=-L/opt/vagrant/embedded/lib64/
+                ./configure --prefix=/opt/vagrant/embedded/
+                make
+                sudo cp -a lib/crypto/libk5crypto.so.3* /opt/vagrant/embedded/lib64/
+            fi
+            ;;
+        *)
+            ;;
+    esac
 fi
 
 vagrant plugin list | grep vagrant-libvirt || {
@@ -55,7 +105,12 @@ vagrant plugin list | grep vagrant-libvirt || {
     vagrant plugin install vagrant-libvirt
 }
 
-rpm -qa | grep libselinux
+if [ -f /etc/debian_version ]; then
+    dpkg -l | grep libselinux
+    [ -x /usr/bin/aa-enabled ] && echo "Apparmor: `/usr/bin/aa-enabled`"
+else
+    rpm -qa | grep libselinux
+fi
 
 vagrant version
 vagrant global-status
@@ -69,5 +124,6 @@ vagrant plugin list | tee >(grep -q "No plugins installed." && {
 # we will use during testing.
 cd $DIR
 
-vagrant up --no-provision
-vagrant destroy -f
+# sudo su: dirty hack to make sure that usermod change has been taken into account
+sudo su -l "$(whoami)" -c "cd $(pwd) && vagrant up --no-provision"
+sudo su -l "$(whoami)" -c "cd $(pwd) && vagrant destroy -f"