diff --git a/.zuul.yaml b/.zuul.yaml
index c8fc94cba..52a2213c7 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,8 +1,7 @@
 - project:
     templates:
       - 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 cc57f7346..96d56f6ea 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
     Topic :: System :: Monitoring
 
 [global]
diff --git a/tox.ini b/tox.ini
index 8b69efb54..f51bc35a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py{27}{,-mysql,-postgresql},functional,pep8
+envlist = py{27,37}{,-mysql,-postgresql},functional,pep8
 
 [testenv]
 # NOTE(tonyb): This project has chosen to *NOT* consume upper-constraints.txt