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