diff --git a/.zuul.yaml b/.zuul.yaml
index a605026..dd1c86a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,8 +3,7 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - publish-openstack-docs-pti
       - check-requirements
       - release-notes-jobs-python3
diff --git a/setup.cfg b/setup.cfg
index 8cdd577..18c77cc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,6 +16,7 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [files]
 packages = monascaclient
diff --git a/tox.ini b/tox.ini
index ffd0df0..7ffbeb9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,36},pypy,cover,pep8
+envlist = py{27,36,37},pypy,cover,pep8
 minversion = 2.5
 skipsdist = True