diff --git a/.zuul.yaml b/.zuul.yaml
index 73b0cc06..73f9ad18 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -8,8 +8,7 @@
       - lib-forward-testing-python3
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
diff --git a/tox.ini b/tox.ini
index 4c5d2bf3..3b30c311 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.1
-envlist = py27,py36,py37,pep8
+envlist = py27,py37,pep8
 basepython = python3
 ignore_basepython_conflict = true