diff --git a/.zuul.yaml b/.zuul.yaml
index 854cc045..2b0c758b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,8 +5,7 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - openstackclient-plugin-jobs
       - publish-openstack-docs-pti
     gate:
diff --git a/setup.cfg b/setup.cfg
index b4605c24..ce28c7c2 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
     Topic :: Internet :: Name Service (DNS)
 
 [global]
diff --git a/tox.ini b/tox.ini
index 93b25616..8dc55d77 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py27,flake8
+envlist = py27,py37,flake8
 minversion = 2.0
 skipsdist = True