diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 3d31f6a963..4f27b823ef 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -47,6 +47,7 @@ openstack-infra:
       - openstack-infra/statusbot
       - openstack-infra/storyboard
       - openstack-infra/storyboard-webclient
+      - openstack-infra/subunit2sql
       - openstack-infra/vinz
       - openstack-infra/vinz-webclient
       - openstack-infra/zuul
@@ -54,6 +55,7 @@ openstack-infra:
       - openstack/requirements
       - stackforge/gertty
       - stackforge/python-jenkins
+
     branches:
       - master
       - feature/gearman
@@ -233,6 +235,7 @@ openstack-qa:
       - openstack-dev/grenade
       - openstack-infra/elastic-recheck
       - openstack-infra/devstack-gate
+      - openstack-infra/subunit2sql
     branches:
       - master
 
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/subunit2sql.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/subunit2sql.config
new file mode 100644
index 0000000000..5e0ca3a8c8
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/subunit2sql.config
@@ -0,0 +1,11 @@
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group subunit2sql-core
+        label-Workflow = -1..+1 group subunit2sql-core
+        abandon = group subunit2sql-core
+[access "refs/tags/*"]
+        pushSignedTag = group subunit2sql-ptl
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = False
+[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 320389d885..0e2b4d0f94 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2836,6 +2836,15 @@
     jobs:
       - python-jobs
 
+- project:
+    name: subunit2sql
+    github-org: openstack-infra
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+
 - project:
     name: python-magnetodbclient
     github-org: stackforge
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index c63fd66aca..b6fc84381a 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -199,6 +199,9 @@
   upstream: git://github.com/krotscheck/storyboard-webclient.git
   description: OpenStack Task Tracking Browser Client
   use-storyboard: true
+- project: openstack-infra/subunit2sql
+  description: Tooling for converting subunit streams into a SQL DB
+  upstream: https://github.com/mtreinish/subunit2sql
 - project: openstack-infra/tripleo-ci
   description: CI for the tripleo project
   upstream: https://github.com/toci-dev/toci
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 9686fa38ca..6147e01a0d 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -3028,6 +3028,14 @@ projects:
     release:
       - storyboard-webclient-js-release-master
 
+  - name: openstack-infra/subunit2sql
+    check:
+      - gate-subunit2sql-pep8
+      - gate-subunit2sql-python27
+    gate:
+      - gate-subunit2sql-pep8
+      - gate-subunit2sql-python27
+
   - name: openstack-infra/vinz
     template:
       - name: publish-to-pypi