diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 05e3829834..0348201e2c 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -170,6 +170,7 @@ savanna:
       - openstack/savanna-extra
       - openstack/savanna-image-elements
       - stackforge/puppet-savanna
+      - stackforge/savanna-ci-config
     branches:
       - master
       - stable/0.1
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/savanna-ci-config.config b/modules/openstack_project/files/gerrit/acls/stackforge/savanna-ci-config.config
new file mode 100644
index 0000000000..42eda668c3
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/savanna-ci-config.config
@@ -0,0 +1,8 @@
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group savanna-ci-config-admins
+        label-Approved = +0..+1 group savanna-ci-config-admins
+        workInProgress = group savanna-ci-config-admins
+[receive]
+        requireChangeId = true
+[submit]
+        mergeContent = true
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 a424c47c5e..e95d12443f 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1443,6 +1443,15 @@
       - gate-{name}-puppet-syntax
       - puppet-module-unit
 
+- project:
+    name: savanna-ci-config
+    github-org: stackforge
+    node: precise
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - gate-{name}-pep8
+
 - project:
     name: puppet-swift
     github-org: stackforge
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index 950ae7a292..d0077607be 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -729,6 +729,9 @@
 - project: stackforge/rubick
   description: Rule-based diagnostics of configuration of OpenStack platform
   upstream: git://github.com/MirantisLabs/rubick
+- project: stackforge/savanna-ci-config
+  description: savanna-ci 3rd party testing configs (jjb, zuul, etc.)
+  acl-config: /home/gerrit2/acls/stackforge/savanna-ci-config.config
 - project: stackforge/solum
   description: 'An OpenStack related project designed to make cloud services easier to consume and integrate into your application development process. See: https://wiki.openstack.org/wiki/Solum'
   upstream: git://github.com/rackerlabs/solum
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 614e962aef..4f12dee36f 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -3938,6 +3938,12 @@ projects:
       - gate-puppet-savanna-puppet-unit-3.3
       - gate-puppet-savanna-puppet-unit-3.4
 
+  - name: stackforge/savanna-ci-config
+    check:
+      - gate-savanna-ci-config-pep8
+    gate:
+      - gate-savanna-ci-config-pep8
+
   - name: stackforge/puppet-swift
     check:
       - gate-puppet-swift-puppet-lint