diff --git a/.zuul.yaml b/.zuul.yaml
index b23d0a82e0..e4a1d2a327 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,8 +4,7 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
diff --git a/setup.cfg b/setup.cfg
index ed1ada9171..5c8b9a98f1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,7 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [files]
 data_files =
diff --git a/tox.ini b/tox.ini
index 410b857b2a..e4bd205909 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py36,pep8,apiexamples,cover,api-ref,releasenotes,bandit,fakemodetests,pylint
+envlist = py27,py36,py37,pep8,apiexamples,cover,api-ref,releasenotes,bandit,fakemodetests,pylint
 minversion = 2.0
 skipsdist = True