diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index 67b1b5cca9..4947d6f2d4 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -110,6 +110,11 @@
           COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
           ruby1.9.1 /usr/bin/bundle exec rspec .cookbooks/$COOKBOOK
 
+- builder:
+    name: run-tests
+    builders:
+      - shell: "./run-tests.sh {github-org} {project}"
+
 - builder:
     name: selenium
     builders:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
index 4edb6175ad..46f2d8ff58 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
@@ -1,3 +1,16 @@
 - job:
     name: gate-noop
     node: precise
+
+- job-template:
+    name: 'gate-{name}-run-tests'
+
+    builders:
+      - run-tests:
+          github-org: '{github-org}'
+          project: '{name}'
+
+    publishers:
+      - console-log
+
+    node: '{node}'
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 2c995b7b3b..dfe5a0460d 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1140,3 +1140,11 @@
 
     jobs:
       - python-jobs
+
+- project:
+    name: cl-openstack-client
+    github-org: stackforge
+    node: precise
+
+    jobs:
+      - gate-{name}-run-tests
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index d07bed3387..1be7733b28 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2143,6 +2143,6 @@ projects:
 
   - name: stackforge/cl-openstack-client
     check:
-      - gate-noop
+      - gate-cl-openstack-client-run-tests
     gate:
-      - gate-noop
+      - gate-cl-openstack-client-run-tests