diff --git a/tox.ini b/tox.ini
index 035c9e142..fadfd244d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -308,6 +308,7 @@ setenv =
     IR_HOME = {env:IR_HOME:{envdir}/home/infrared}
     IR_TOBIKO_PLUGIN = {env:IR_TOBIKO_PLUGIN:{toxinidir}/infrared_plugin}
     IR_WORKSPACE_FILE = {env:IR_WORKSPACE_FILE:{toxinidir}/workspace.tgz}
+    SETUPTOOLS_USE_DISTUTILS = stdlib
 
 commands_pre =
     {envpython} {toxinidir}/tools/setup_infrared.py
diff --git a/zuul.d/infrared.yaml b/zuul.d/infrared.yaml
index 842c5b52d..82580f229 100644
--- a/zuul.d/infrared.yaml
+++ b/zuul.d/infrared.yaml
@@ -8,10 +8,11 @@
       jobs:
         - tobiko-infrared
         - tobiko-infrared-centos-7
+        - tobiko-infrared-fedora
+        - tobiko-infrared-ubuntu
     gate:
       jobs:
         - tobiko-infrared
-        - tobiko-infrared-centos-7
     periodic:
       jobs:
         - tobiko-infrared
@@ -110,7 +111,7 @@
     name: tobiko-infrared-ubuntu
     parent: tobiko-infrared
     nodeset: tobiko-infrared-ubuntu
-    voting: false
+    voting: true
     description: |
       Run test cases using tobiko infrared plugin on Ubuntu