diff --git a/.zuul.yaml b/.zuul.yaml
index 05d052ead5..743f7d495a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -41,6 +41,20 @@
       tox_envlist: py35
       bindep_profile: test py35
 
+- job:
+    name: swift-tox-py36
+    parent: swift-tox-base
+    nodeset: ubuntu-bionic
+    description: |
+      Run unit-tests for swift under cPython version 3.6.
+
+      Uses tox with the ``py36`` environment.
+      It sets TMPDIR to an XFS mount point created via
+      tools/test-setup.sh.
+    vars:
+      tox_envlist: py36
+      bindep_profile: test py36
+
 - job:
     name: swift-tox-func
     parent: swift-tox-base
@@ -189,6 +203,11 @@
             irrelevant-files:
               - ^(api-ref|doc|releasenotes)/.*$
               - ^test/(functional|probe)/.*$
+        - swift-tox-py36:
+            irrelevant-files:
+              - ^(api-ref|doc|releasenotes)/.*$
+              - ^test/(functional|probe)/.*$
+            voting: false
         - swift-tox-func:
             irrelevant-files:
               - ^(api-ref|doc|releasenotes)/.*$