diff --git a/.zuul.yaml b/.zuul.yaml
index 5677e2c..cd91aa3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,7 +3,6 @@
       - check-requirements
       - 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
diff --git a/setup.cfg b/setup.cfg
index d2a6512..67857d9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,6 +9,7 @@ classifiers =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
     Environment :: OpenStack
     Intended Audience :: Information Technology
     Intended Audience :: System Administrators
diff --git a/tox.ini b/tox.ini
index dba02b2..1c12e18 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,6 +24,10 @@ commands = oslo_debug_helper -t sahara_plugin_vanilla/tests/unit {posargs}
 basepython = python3.6
 commands = oslo_debug_helper -t sahara_plugin_vanilla/tests/unit {posargs}
 
+[testenv:debug-py37]
+basepython = python3.7
+commands = oslo_debug_helper -t sahara_plugin_vanilla/tests/unit {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps =