diff --git a/.zuul.yaml b/.zuul.yaml
index 4dea3b3a8..8338d13b6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -9,7 +9,7 @@
     post-run: playbooks/tox-post.yaml
     vars:
       devstack_localrc:
-        USE_PYTHON3: True
+        USE_PYTHON3: true
       devstack_services:
         key: true
       tox_envlist: functional
@@ -20,8 +20,7 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - publish-openstack-docs-pti
       - check-requirements
       - lib-forward-testing
diff --git a/tox.ini b/tox.ini
index 43401c9ce..cb020c4a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 2.5.0
 skipsdist = True
-envlist = py37,py36,py27,pep8,releasenotes
+envlist = py27,py37,pep8,releasenotes
 
 [testenv]
 usedevelop = True