diff --git a/.zuul.yaml b/.zuul.yaml
index 127d2525..58d13037 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,8 +3,7 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - check-requirements
       - release-notes-jobs-python3
       - publish-openstack-docs-pti
diff --git a/setup.cfg b/setup.cfg
index e7a4ef9f..18b635ac 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,6 +21,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 93630714..b5c5a1c1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,pep8,docs
+envlist = py37,py27,pep8,docs
 minversion = 2.0
 skipsdist = True