diff --git a/.zuul.yaml b/.zuul.yaml
index 0f6531ea..15b68884 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,8 +4,7 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - release-notes-jobs-python3
     check:
       jobs:
diff --git a/setup.cfg b/setup.cfg
index 3105584f..14716cd9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,6 +7,13 @@ classifier=
   Development Status :: 5 - Production/Stable
   License :: OSI Approved :: Apache Software License
   Topic :: System :: Monitoring
+  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
+
 keywords = openstack monitoring storage
 description-file = README.rst
 home-page = https://github.com/openstack/monasca-persister
diff --git a/tox.ini b/tox.ini
index 5ebfbf9a..2f991c80 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py36,pep8
+envlist = py27,py37,pep8
 minversion = 2.1
 skipsdist = True