diff --git a/.zuul.yaml b/.zuul.yaml
index 5e150d0f..7885ce32 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,7 +4,7 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
+      - openstack-python3-train-jobs
     check:
       jobs:
         - monasca-tempest-python2-influxdb
diff --git a/setup.cfg b/setup.cfg
index 27002a92..93a5148c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,7 +13,9 @@ classifier =
     Operating System :: POSIX :: Linux
     Programming Language :: Python
     Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [global]
 setup-hooks =
diff --git a/tox.ini b/tox.ini
index 6265034a..a36a81c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,36},pep8,cover
+envlist = py27,py37,pep8,cover
 minversion = 2.5
 skipsdist = True