diff --git a/.zuul.yaml b/.zuul.yaml
index 5b226e6..974970b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,6 +3,7 @@
       - docs-on-readthedocs
       - openstack-python-jobs
       - openstack-python35-jobs
+      - openstack-python36-jobs
     vars:
       rtd_webhook_id: '61274'
     check:
diff --git a/setup.cfg b/setup.cfg
index 68852f2..f23b11d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,6 +19,7 @@ classifier =
     Programming Language :: Python :: 3.3
     Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index d2957b9..aed2fa2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py27,py27sa07,py27sa08,py27sa09,py33,py34,py35,pep8
+envlist = py27,py27sa07,py27sa08,py27sa09,py33,py34,py35,py36,pep8
 
 [testenv]
 usedevelop = True
@@ -44,6 +44,10 @@ deps = sqlalchemy>=0.9
 deps = sqlalchemy>=0.9
        -r{toxinidir}/test-requirements.txt
 
+[testenv:py36]
+deps = sqlalchemy>=0.9
+       -r{toxinidir}/test-requirements.txt
+
 [testenv:pep8]
 commands = flake8