diff --git a/.zuul.yaml b/.zuul.yaml
index f6e3a36..f3b5a0f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,6 +2,7 @@
     templates:
       - openstack-python-jobs-no-constraints
       - openstack-python35-jobs-no-constraints
+      - openstack-python36-jobs-no-constraints
     check:
       jobs:
         - opendev-buildset-registry
diff --git a/setup.cfg b/setup.cfg
index 726e95b..8caae1c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,7 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
 
 [entry_points]
 console_scripts =
diff --git a/tox.ini b/tox.ini
index b7d5364..304cdce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py35,py27,pypy,pep8
+envlist = py36,py35,py27,pypy,pep8
 skipsdist = True
 
 [testenv]