diff --git a/tests/manylinux_compliant.sh b/tests/manylinux_compliant.sh
index 7a4e3b086..5cba08c02 100755
--- a/tests/manylinux_compliant.sh
+++ b/tests/manylinux_compliant.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+set -e
+
 which cargo > /dev/null 2>&1 || curl -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
 
-for PYBIN in /opt/python/cp3[6789]*/bin; do
+for PYBIN in /opt/python/cp3[789]*/bin; do
   cargo run -- build --no-sdist -m test-crates/pyo3-mixed/Cargo.toml -i "${PYBIN}/python" --manylinux $1 -o dist
 done
diff --git a/tests/manylinux_incompliant.sh b/tests/manylinux_incompliant.sh
index a04a645c7..e64c9dd4d 100755
--- a/tests/manylinux_incompliant.sh
+++ b/tests/manylinux_incompliant.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -e
+
 which cargo > /dev/null || curl -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
 
 # Fail because we're running in manylinux2014, which can't build for manylinux 2010
@@ -12,7 +14,8 @@ for PYBIN in /opt/python/cp3[9]*/bin; do
 done
 
 # Fail because we're linking zlib with black-listed symbols(gzflags), which is not allowed in manylinux
-yum install -y zlib-devel
+apt-get -v &> /dev/null && apt-get install -y zlib1g-dev || yum install -y zlib-devel
+
 for PYBIN in /opt/python/cp3[9]*/bin; do
   if cargo run -- build --no-sdist -m test-crates/lib_with_disallowed_lib/Cargo.toml -i "${PYBIN}/python" --manylinux 2014 -o dist; then
     echo "maturin build unexpectedly succeeded"