diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 3ce62189c4..ed8952ec85 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1655,24 +1655,16 @@
     jobs:
       - python-jobs
       - pypi-jobs
+      # For anyone running without eventlet
       - gate-{name}-tox-{envlist}:
-          envlist: py26-sa7-ev # For RHEL6.x/CENTOS6.x
+          envlist: py26-sa7-mysql
       - gate-{name}-tox-{envlist}:
-          envlist: py27-ev
+          envlist: py27-sa8-mysql
+      # For anyone running the latest without eventlet
       - gate-{name}-tox-{envlist}:
-          envlist: py27-sa7
+          envlist: py26-sa9-mysql
       - gate-{name}-tox-{envlist}:
-          envlist: py27-sa7-ev
-      - gate-{name}-tox-{envlist}:
-          envlist: py27-sa8
-      - gate-{name}-tox-{envlist}:
-          envlist: py27-sa8-ev
-      - gate-{name}-tox-{envlist}:
-          envlist: py27-sa9
-      - gate-{name}-tox-{envlist}:
-          envlist: py27-sa9-ev
-      - gate-{name}-tox-{envlist}:
-          envlist: py33-sa9 # For anyone running on newest
+          envlist: py27-sa9-mysql
 
 - project:
     name: cl-openstack-client
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index bd7abdddd4..2bec2c2be0 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -4073,29 +4073,19 @@ projects:
       - gate-taskflow-python26
       - gate-taskflow-python27
       - gate-taskflow-python33
-      - gate-taskflow-tox-py26-sa7-ev
-      - gate-taskflow-tox-py27-ev
-      - gate-taskflow-tox-py27-sa7
-      - gate-taskflow-tox-py27-sa7-ev
-      - gate-taskflow-tox-py27-sa8
-      - gate-taskflow-tox-py27-sa8-ev
-      - gate-taskflow-tox-py27-sa9
-      - gate-taskflow-tox-py27-sa9-ev
-      - gate-taskflow-tox-py33-sa9
+      - gate-taskflow-tox-py26-sa7-mysql
+      - gate-taskflow-tox-py27-sa8-mysql
+      - gate-taskflow-tox-py26-sa9-mysql
+      - gate-taskflow-tox-py27-sa9-mysql
     gate:
       - gate-taskflow-pep8
       - gate-taskflow-python26
       - gate-taskflow-python27
       - gate-taskflow-python33
-      - gate-taskflow-tox-py26-sa7-ev
-      - gate-taskflow-tox-py27-ev
-      - gate-taskflow-tox-py27-sa7
-      - gate-taskflow-tox-py27-sa7-ev
-      - gate-taskflow-tox-py27-sa8
-      - gate-taskflow-tox-py27-sa8-ev
-      - gate-taskflow-tox-py27-sa9
-      - gate-taskflow-tox-py27-sa9-ev
-      - gate-taskflow-tox-py33-sa9
+      - gate-taskflow-tox-py26-sa7-mysql
+      - gate-taskflow-tox-py27-sa8-mysql
+      - gate-taskflow-tox-py26-sa9-mysql
+      - gate-taskflow-tox-py27-sa9-mysql
     post:
       - taskflow-coverage
       - taskflow-branch-tarball