diff --git a/.zuul.yaml b/.zuul.yaml
index 9b95a282f4..19f68189ab 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -294,8 +294,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 985191dc82..0cac6300af 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 =