diff --git a/.zuul.yaml b/.zuul.yaml
index 9b55798d1..9bb02cced 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -219,7 +219,7 @@
       - check-requirements
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
+      - openstack-python3-train-jobs
       - publish-openstack-docs-pti
       - publish-to-pypi
       - release-notes-jobs-python3
diff --git a/setup.cfg b/setup.cfg
index 6d1012035..49da06cd6 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
 
 [entry_points]
 console_scripts =
diff --git a/tox.ini b/tox.ini
index 7725b5903..9d32cd75f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py36,py35,py27,pep8
+envlist = py27,py37,pep8
 skipsdist = True
 
 [testenv]