diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 012df5a35f..b99065aea0 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -208,6 +208,7 @@ puppet-openstack:
       - stackforge/puppet-openstack_dev_env
       - stackforge/puppet-quantum
       - stackforge/puppet-swift
+      - stackforge/puppet-tempest
     branches:
       - master
 
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 4360d7f926..415b664da9 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -849,7 +849,6 @@
     jobs:
       - python-jobs
 
-
 - project:
     name: puppet-glance
     github-org: stackforge
@@ -859,7 +858,6 @@
     jobs:
       - puppet-module-unit
 
-
 - project:
     name: puppet-keystone
     github-org: stackforge
@@ -869,7 +867,6 @@
     jobs:
       - puppet-module-unit
 
-
 - project:
     name: puppet-ceilometer
     github-org: stackforge
@@ -879,7 +876,6 @@
     jobs:
       - puppet-module-unit
 
-
 - project:
     name: puppet-cinder
     github-org: stackforge
@@ -889,7 +885,6 @@
     jobs:
       - puppet-module-unit
 
-
 - project:
     name: puppet-nova
     github-org: stackforge
@@ -899,7 +894,6 @@
     jobs:
       - puppet-module-unit
 
-
 - project:
     name: puppet-horizon
     github-org: stackforge
@@ -909,7 +903,6 @@
     jobs:
       - puppet-module-unit
 
-
 - project:
     name: puppet-openstack
     github-org: stackforge
@@ -919,7 +912,6 @@
     jobs:
       - puppet-module-unit
 
-
 - project:
     name: puppet-swift
     github-org: stackforge
@@ -929,6 +921,15 @@
     jobs:
       - puppet-module-unit
 
+- project:
+    name: puppet-tempest
+    github-org: stackforge
+    node: precise
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - puppet-module-unit
+
 - project:
     name: puppet-quantum
     github-org: stackforge
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index f72a8527c9..03a5faaa50 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1680,6 +1680,18 @@ projects:
       - gate-puppet-swift-puppet-unit-3.0
       - gate-puppet-swift-puppet-unit-3.1
 
+  - name: stackforge/puppet-tempest
+    check:
+      - gate-puppet-tempest-puppet-unit-2.6
+      - gate-puppet-tempest-puppet-unit-2.7
+      - gate-puppet-tempest-puppet-unit-3.0
+      - gate-puppet-tempest-puppet-unit-3.1
+    gate:
+      - gate-puppet-tempest-puppet-unit-2.6
+      - gate-puppet-tempest-puppet-unit-2.7
+      - gate-puppet-tempest-puppet-unit-3.0
+      - gate-puppet-tempest-puppet-unit-3.1
+
   - name: stackforge/puppet-openstack_dev_env
     check:
       - gate-noop
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index 54a62b6795..654f34601e 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -186,6 +186,10 @@
   description: OpenStack Swift Puppet Module
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
   upstream: git://github.com/puppetlabs/puppetlabs-swift.git
+- project: stackforge/puppet-tempest
+  description: OpenStack Tempest Puppet Module
+  acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
+  upstream: git://github.com/puppetlabs/puppetlabs-tempest.git
 - project: stackforge/puppet-quantum
   description: OpenStack Quantum Puppet Module
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config