diff --git a/.zuul.yaml b/.zuul.yaml
index 783fa30c8..e9e8bda93 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -212,6 +212,7 @@
 
 - project:
     templates:
+      - openstack-python36-jobs
       - openstacksdk-functional-tips
       - openstacksdk-tox-tips
       - os-client-config-tox-tips
diff --git a/setup.cfg b/setup.cfg
index 9d56d0e02..fd51be71d 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
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index b74e095d4..6eb25ed14 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py35,py27,pep8
+envlist = py35,py36,py27,pep8
 skipsdist = True
 
 [testenv]