diff --git a/.zuul.yaml b/.zuul.yaml
index 2083db1b..640e8239 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -54,7 +54,7 @@
 - project:
     templates:
       - openstack-python-jobs-neutron
-      - openstack-python36-jobs-neutron
+      - openstack-python3-train-jobs-neutron
       - openstack-python3-train-jobs
       - check-requirements
       - publish-openstack-docs-pti
diff --git a/tox.ini b/tox.ini
index 42024266..48647544 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py36,py37,py27,pypy,pep8
+envlist = py27,py37,pypy,pep8
 skipsdist = True
 
 [testenv]