diff --git a/.zuul.yaml b/.zuul.yaml
index a891329a..10923e69 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -16,8 +16,7 @@
       - check-requirements
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
-      - openstack-python36-jobs
+      - openstack-python3-train-jobs
       - openstackclient-plugin-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
diff --git a/setup.cfg b/setup.cfg
index 4bec19d8..22ab0922 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,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
 
 [global]
 setup-hooks =
diff --git a/tox.ini b/tox.ini
index 243e2b07..8a5ebbe5 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]