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 59b8c9ca7e..76ae0079c0 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1226,8 +1226,8 @@
     jobs:
       - python-jobs
       - openstack-publish-jobs
-      - gate-{name}-unittests-{env}:
-          env: func
+      - 'gate-{name}-tox-{envlist}':
+          envlist: func
       - '{pipeline}-swift-dsvm-functional{branch-designator}':
           pipeline: gate
           node: devstack-precise
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml b/modules/openstack_project/files/jenkins_job_builder/config/swift.yaml
similarity index 100%
rename from modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml
rename to modules/openstack_project/files/jenkins_job_builder/config/swift.yaml
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index ec72ed1e37..ecdc75bde8 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -578,7 +578,8 @@ jobs:
     voting: false
   - name: gate-heat-templates-dsvm
     voting: false
-  - name: gate-swift-unittests-func
+  - name: gate-swift-tox-func
+    branch: ^(?!stable/(havana|icehouse)).*$
     voting: false
 
 # The project list is grouped by type of project, and within each
@@ -1037,14 +1038,14 @@ projects:
       - name: check-requirements
       - name: integrated-gate
     check:
-      - gate-swift-unittests-func
+      - gate-swift-tox-func
       - check-swift-dsvm-functional
       - check-devstack-dsvm-cells
       - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     gate:
-      - gate-swift-unittests-func
+      - gate-swift-tox-func
       - gate-swift-dsvm-functional
       - gate-devstack-dsvm-cells
       - gate-tempest-dsvm-postgres-full