diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index f49965f37d..50f8488129 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -251,6 +251,7 @@ puppet-openstack:
       - stackforge/puppet-openstacklib
       - stackforge/puppet_openstack_builder
       - stackforge/puppet-openstack_dev_env
+      - stackforge/puppet-openstack_extras
       - stackforge/puppet-swift
       - stackforge/puppet-tempest
       - stackforge/puppet-vswitch
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 e3b7862a47..136cd9c801 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1735,6 +1735,17 @@
       - gate-{name}-puppet-syntax
       - puppet-module-unit
 
+- project:
+    name: puppet-openstack_extras
+    github-org: stackforge
+    node: bare-precise
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - gate-{name}-puppet-lint
+      - gate-{name}-puppet-syntax
+      - puppet-module-unit
+
 - project:
     name: puppet-sahara
     github-org: stackforge
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index d7fa0ccf1b..62396ce365 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -868,6 +868,10 @@
   description: OpenStack Puppet Dev Environment
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
   upstream: git://github.com/puppetlabs/puppetlabs-openstack_dev_env.git
+- project: stackforge/puppet-openstack_extras
+  group: puppet-openstack
+  description: Helper classes that utilize the core Puppet Openstack modules
+  acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
 - project: stackforge/puppet-sahara
   group: sahara
   description: Sahara Puppet Module
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 47458567d6..ebf20bc8e8 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -4009,6 +4009,24 @@ projects:
     gate:
       - noop
 
+  - name: stackforge/puppet-openstack_extras
+    check:
+      - gate-puppet-openstack_extras-puppet-lint
+      - gate-puppet-openstack_extras-puppet-syntax
+      - gate-puppet-openstack_extras-puppet-unit-2.7
+      - gate-puppet-openstack_extras-puppet-unit-3.1
+      - gate-puppet-openstack_extras-puppet-unit-3.2
+      - gate-puppet-openstack_extras-puppet-unit-3.3
+      - gate-puppet-openstack_extras-puppet-unit-3.4
+    gate:
+      - gate-puppet-openstack_extras-puppet-lint
+      - gate-puppet-openstack_extras-puppet-syntax
+      - gate-puppet-openstack_extras-puppet-unit-2.7
+      - gate-puppet-openstack_extras-puppet-unit-3.1
+      - gate-puppet-openstack_extras-puppet-unit-3.2
+      - gate-puppet-openstack_extras-puppet-unit-3.3
+      - gate-puppet-openstack_extras-puppet-unit-3.4
+
   - name: stackforge/puppet-sahara
     check:
       - gate-puppet-sahara-puppet-lint