diff --git a/.zuul.yaml b/.zuul.yaml
index a00ffa37c..0909d8155 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,15 +5,19 @@
 
 - project:
     merge-mode: squash-merge
+    templates:
+      - publish-to-pypi
     check:
       jobs:
         - tox-py37
+        - tox-py38
         - tox-pep8
         - tox-docs
         - tox-functional
     gate:
       jobs:
         - tox-py37
+        - tox-py38
         - tox-pep8
         - tox-docs
         - tox-functional
diff --git a/bindep.txt b/bindep.txt
index eb458b065..cf94d2a8c 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,6 +1,11 @@
-build-essential [platform:dpkg]
-python-dev [platform:dpkg]
-python-devel [platform:rpm]
-libffi-dev [platform:dpkg]
+# This is a cross-platform list tracking distribution packages needed by tests;
+# see https://docs.openstack.org/infra/bindep/ for additional information.
+
+gcc [compile test]
+libc6-dev [compile test platform:dpkg]
 libffi-devel [platform:rpm]
-openssl-devel [platform:rpm]
+libffi-dev [compile test platform:dpkg]
+libffi6 [platform:dpkg]
+libssl-dev [compile test platform:dpkg]
+python3-dev [compile test platform:dpkg]
+python3-devel [compile test platform:rpm]