diff --git a/.zuul.yaml b/.zuul.yaml
index 1b0c729..e292007 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
       - openstack-cover-jobs
       - publish-openstack-docs-pti
       - check-requirements
diff --git a/tox.ini b/tox.ini
index e8d1fe1..8b8c6bd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy,py37,py36,py27,pep8
+envlist = pypy,py27,py37,pep8
 minversion = 2.0
 skipsdist = True