diff --git a/tests/buildah_fix.sh b/tests/buildah_fix.sh
new file mode 100755
index 0000000..d633bc6
--- /dev/null
+++ b/tests/buildah_fix.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -ex
+
+sudo apt-get remove buildah
+sudo apt-get -y install software-properties-common
+sudo add-apt-repository -y ppa:alexlarsson/flatpak
+sudo apt-get -y -qq update
+sudo apt-get -y install bats libapparmor-dev libdevmapper-dev libglib2.0-dev libgpgme11-dev libseccomp-dev libselinux1-dev skopeo-containers go-md2man
+sudo apt-get -y install golang-1.13
+mkdir ~/buildah
+pushd ~/buildah
+export GOPATH=`pwd`
+git clone https://github.com/containers/buildah ./src/github.com/containers/buildah
+cd ./src/github.com/containers/buildah
+git checkout release-1.19
+PATH=/usr/lib/go-1.13/bin:$PATH make runc all SECURITYTAGS="apparmor seccomp"
+sudo make install install.runc
+buildah version
+popd
diff --git a/tests/make_pdns_container.sh b/tests/make_pdns_container.sh
index 5b51f50..187a2ea 100755
--- a/tests/make_pdns_container.sh
+++ b/tests/make_pdns_container.sh
@@ -11,6 +11,8 @@ fi
 scriptdir=$(realpath $(dirname ${BASH_SOURCE[0]}))
 pdns=${1}
 
+${scriptdir}/buildah_fix.sh
+
 c=$(buildah from ${base_image})
 
 buildcmd() {
diff --git a/tests/make_tox_container.sh b/tests/make_tox_container.sh
index 0a06121..b0a83a3 100755
--- a/tests/make_tox_container.sh
+++ b/tests/make_tox_container.sh
@@ -6,6 +6,8 @@ scriptdir=$(realpath $(dirname ${BASH_SOURCE[0]}))
 pdns=${1}
 pydeps=(build-essential libreadline-gplv2-dev libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev libffi-dev zlib1g-dev)
 
+${scriptdir}/buildah_fix.sh
+
 c=$(buildah from debian:buster)
 
 buildcmd() {