diff --git a/.zuul.yaml b/.zuul.yaml
index acaead9..1b05433 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,8 +1,7 @@
 - project:
     templates:
       - openstack-python-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - publish-openstack-docs-pti
       - check-requirements
       - release-notes-jobs-python3
diff --git a/tox.ini b/tox.ini
index 334f903..2e73d72 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py36,py37,py27,pep8
+envlist = py27,py37,pep8
 skipsdist = True
 
 [testenv]