diff --git a/.zuul.yaml b/.zuul.yaml
index 1e3112f1e..13178dd6a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -152,8 +152,7 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:
diff --git a/setup.cfg b/setup.cfg
index 704456dae..46ad8549b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,6 +18,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 b44fd8bf2..efd6cbe90 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py36,py27,pep8,docs
+envlist = py27,py36,py37,pep8,docs
 skipsdist = True
 
 [testenv]