diff --git a/.zuul.yaml b/.zuul.yaml
index 1feac0760..056733ea3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,8 +5,7 @@
       - lib-forward-testing-python3
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:
diff --git a/tox.ini b/tox.ini
index 13757c74a..bf6a525b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py36,py27,pep8
+envlist = py27,py37,pep8
 skipsdist = True
 
 [testenv]