diff --git a/.zuul.yaml b/.zuul.yaml
index e30bcb2..08f3187 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,7 +2,10 @@
     templates:
       - check-requirements
       - openstack-python-jobs
-      - openstack-python35-jobs-nonvoting
+      - openstack-python35-jobs
+      - openstack-python36-jobs
+      - publish-openstack-docs-pti
+      - release-notes-jobs-python3
     check:
       jobs:
         - openstack-tox-lower-constraints
diff --git a/tox.ini b/tox.ini
index e65e0a6..b4b1ffc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py35,py27,pypy,pep8
+envlist = pep8,py27,py35,py36
 skipsdist = True
 
 [testenv]
@@ -35,6 +35,12 @@ commands =
     {[testenv]commands}
     ostestr '{posargs}'
 
+[testenv:py36]
+basepython = python3.6
+commands =
+    {[testenv]commands}
+    ostestr '{posargs}'
+
 [testenv:genconfig]
 basepython = python3
 commands = oslo-config-generator --config-file=etc/masakarimonitors/masakarimonitors-config-generator.conf