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 90409b177b..3b768e301f 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1226,6 +1226,8 @@
     jobs:
       - python-jobs
       - openstack-publish-jobs
+      - gate-{name}-unittests-{env}:
+          env: func
       - '{pipeline}-swift-dsvm-functional{branch-designator}':
           pipeline: gate
           node: devstack-precise
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index a6c7710b39..dda554998c 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -572,6 +572,8 @@ jobs:
     voting: false
   - name: gate-heat-templates-dsvm
     voting: false
+  - name: gate-swift-unittests-func
+    voting: false
 
 # The project list is grouped by type of project, and within each
 # group, projects are sorted (mostly) alphabetically.
@@ -1026,12 +1028,14 @@ projects:
       - name: check-requirements
       - name: integrated-gate
     check:
+      - gate-swift-unittests-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-dsvm-functional
       - gate-devstack-dsvm-cells
       - gate-tempest-dsvm-postgres-full