diff --git a/.zuul.yaml b/.zuul.yaml
index b59a3c0..401e7eb 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
     check:
       jobs:
         - legacy-tempest-dsvm-monasca-transform-python-functional:
diff --git a/setup.cfg b/setup.cfg
index f87aff8..ba9633d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,6 +14,9 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [wheel]
 universal = 1
diff --git a/tox.ini b/tox.ini
index c23615c..acc9184 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,pep8
+envlist = py27,py37,pep8
 minversion = 1.6
 skipsdist = True