diff --git a/.zuul.yaml b/.zuul.yaml
index 63cd74ab5f4..91c67e2ace4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,8 +2,7 @@
     templates:
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - publish-openstack-docs-pti
       - periodic-stable-jobs
       - check-requirements
diff --git a/setup.cfg b/setup.cfg
index 7c504c6eed3..4a3e8fe3cbd 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
 
 [global]
 setup-hooks =
diff --git a/tox.ini b/tox.ini
index 0a96ac19f46..4946240c3a1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 minversion = 2.5
 skipsdist = True
 skip_missing_interpreters = true
-envlist = py36,py27,compliance,pep8
+envlist = py37,py27,compliance,pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}