diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
index 1caf465e63..ed256f56bf 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@@ -1023,6 +1023,16 @@
 
     publishers:
       - devstack-logs
+
+- job:
+    name: gate-devstack-gate-unittests
+    node: precise
+
+    builders:
+      - gerrit-git-prep
+      - shell: "./test-functions.sh"
+
+    publishers:
       - console-log
 
 
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index d9aa3fd664..57eed276d6 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2451,6 +2451,7 @@ projects:
 
   - name: openstack-infra/devstack-gate
     check:
+      - gate-devstack-gate-unittests
       - check-devstack-dsvm-cells
       - check-dg-tempest-dsvm-full
       - check-dg-tempest-dsvm-full-reexec
@@ -2476,6 +2477,7 @@ projects:
       - check-tempest-dsvm-savanna-postgres-nv
       - check-tempest-dsvm-savanna-neutron-nv
     gate:
+      - gate-devstack-gate-unittests
       - gate-devstack-dsvm-cells
       - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full