diff --git a/.zuul.yaml b/.zuul.yaml
index 2a2ef61a..bb523ba3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -16,8 +16,7 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - check-requirements
       - openstackclient-plugin-jobs
       - publish-openstack-docs-pti
diff --git a/setup.cfg b/setup.cfg
index a60efdb5..ef970c1c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,6 +20,7 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index 0861ad2d..117ae5ff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy,py36,py27,pep8
+envlist = pypy,py27,py37,pep8
 minversion = 2.0
 skipsdist = True