diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index 7814bba4..18e50567 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -5,8 +5,7 @@
       - lib-forward-testing-python3
       - 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 d06977f4..5ade52c1 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]
 packages =
diff --git a/tox.ini b/tox.ini
index 7e6ba9f5..18e8bdf0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 2.0
 distribute = False
-envlist = py36,py27,pep8
+envlist = py27,py37,pep8
 
 [testenv]
 install_command = pip install {opts} {packages}