diff --git a/.zuul.yaml b/.zuul.yaml
index a79bb23..5e09c5b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,6 +1,8 @@
 - project:
     check:
       jobs:
+        - openstack-tox-py36:
+            voting: false
         - nodejs-npm-run-lint:
             vars:
               node_version: 4
diff --git a/tox.ini b/tox.ini
index 52a40fe..f4a6e0c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,9 +44,6 @@ commands = python setup.py test --coverage --testr-args='{posargs}'
 # NOTE(shu-mutow): On CI infra, horizon will be installed
 # according to job setting. but on local, we need to install
 # horizon from master branch.
-[testenv:py27]
-basepython = python2.7
-
 [testenv:py27-local]
 basepython = python2.7
 commands =
@@ -59,6 +56,12 @@ commands =
   {[testenv:hz-local]commands}
   {[testenv]commands}
 
+[testenv:py36-local]
+basepython = python3.6
+commands =
+  {[testenv:hz-local]commands}
+  {[testenv]commands}
+
 [testenv:py3-dj111]
 basepython = python3
 commands =