diff --git a/setup.cfg b/setup.cfg
index eb6731c..7bc69b3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,8 @@ classifier =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index 1d61528..1950a1e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py35,py27,pep8
+envlist = py27,py37,pep8
 skipsdist = True
 
 [testenv]
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 6f69a04..1020d97 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -3,8 +3,7 @@
       - openstack-lower-constraints-jobs-neutron
       - openstack-python-jobs-neutron
       - publish-openstack-docs-pti
-      - openstack-python35-jobs-neutron
-      - openstack-python36-jobs-neutron
+      - openstack-python3-train-jobs-neutron
       - release-notes-jobs-python3
     check:
       jobs:
@@ -17,10 +16,10 @@
         - openstack-tox-py27:
             required-projects:
               - openstack/neutron-lib
-        - openstack-tox-py35:
+        - openstack-tox-py36:
             required-projects:
               - openstack/neutron-lib
-        - openstack-tox-py36:
+        - openstack-tox-py37:
             required-projects:
               - openstack/neutron-lib
     gate:
@@ -34,9 +33,9 @@
         - openstack-tox-py27:
             required-projects:
               - openstack/neutron-lib
-        - openstack-tox-py35:
-            required-projects:
-              - openstack/neutron-lib
         - openstack-tox-py36:
             required-projects:
-              - openstack/neutron-lib
\ No newline at end of file
+              - openstack/neutron-lib
+        - openstack-tox-py37:
+            required-projects:
+              - openstack/neutron-lib