diff --git a/.zuul.yaml b/.zuul.yaml
index 6d8dd0748..ad42b7cdc 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -15,6 +15,8 @@
 - job:
     name: python-cinderclient-functional-py36
     parent: python-cinderclient-functional-base
+    # need to specify a platform that has python 3.6 available
+    nodeset: devstack-single-node-centos-8-stream
     vars:
       python_version: 3.6
       tox_envlist: functional-py36
diff --git a/bindep.txt b/bindep.txt
index 812bcbacf..2dbd41a1b 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -7,7 +7,7 @@ libffi-devel [platform:rpm]
 libssl-dev [platform:ubuntu-xenial]
 locales [platform:debian]
 python-dev [platform:dpkg]
-python-devel [platform:rpm]
+python-devel [platform:rpm !platform:centos-8]
 python3-all-dev [platform:ubuntu !platform:ubuntu-precise]
 python3-dev [platform:dpkg]
-python3-devel [platform:fedora]
+python3-devel [platform:rpm]
diff --git a/tox.ini b/tox.ini
index f4740148f..bc78f2496 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
 distribute = False
-envlist = py36,py38,pep8
+envlist = py3,pep8
 minversion = 3.18.0
 skipsdist = True
-skip_missing_interpreters = true
 # this allows tox to infer the base python from the environment name
 # and override any basepython configured in this file
 ignore_basepython_conflict=true