diff --git a/.zuul.yaml b/.zuul.yaml
index 872591be..57602cf0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -16,18 +16,16 @@
         - tox-pep8
         - tox-py27:
             timeout: 6000
-        - tox-py35:
+        - tox-py36:
             timeout: 6000
-            nodeset: ubuntu-xenial
     gate:
       jobs:
         - storyboard-tox-sqlite
         - tox-pep8
         - tox-py27:
             timeout: 6000
-        - tox-py35:
+        - tox-py36:
             timeout: 6000
-            nodeset: ubuntu-xenial
     post:
       jobs:
         - publish-openstack-python-branch-tarball