diff --git a/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml
index e3df24ce34..6c4e860384 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml
@@ -33,3 +33,21 @@
 
     publishers:
       - console-log
+
+- job:
+    name: gate-openstack-chef-repo
+    node: precise
+
+    builders:
+      - gerrit-git-prep
+      - shell: |
+          #!/bin/bash -xe
+          mkdir -p .cookbooks .bundle
+          ruby1.9.1 /usr/bin/bundle install --path=.bundle
+          # Validates cookbooks
+          ruby1.9.1 /usr/bin/bundle exec berks install --path=.cookbooks
+          # Validates roles
+          ruby1.9.1 /usr/bin/bundle exec spiceweasel infrastructure.yml --debug
+
+    publishers:
+      - console-log
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 46315c10f4..18a6c44021 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1095,6 +1095,14 @@
       - gate-{name}-puppet-syntax
       - puppet-module-unit
 
+- project:
+    name: openstack-chef-repo
+    github-org: stackforge
+    node: precise
+
+    jobs:
+      - gate-openstack-chef-repo
+
 - project:
     name: cookbook-openstack-common
     github-org: stackforge
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index ee8a6f201d..d3119be469 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2805,9 +2805,9 @@ projects:
 
   - name: stackforge/openstack-chef-repo
     check:
-      - gate-noop
+      - gate-openstack-chef-repo
     gate:
-      - gate-noop
+      - gate-openstack-chef-repo
 
   - name: stackforge/cookbook-openstack-common
     check: