diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.test.config b/modules/openstack_project/files/gerrit/acls/openstack/oslo.test.config
new file mode 100644
index 0000000000..358e270cf5
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack/oslo.test.config
@@ -0,0 +1,17 @@
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group oslo-core
+        label-Approved = +0..+1 group oslo-core
+        workInProgress = group oslo-core
+[access "refs/heads/milestone-proposed"]
+        label-Code-Review = -2..+2 group oslo-milestone
+        label-Approved = +0..+1 group oslo-milestone
+[access "refs/tags/*"]
+        create = group oslo-core
+        pushTag = group oslo-core
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = 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 3ce4967f51..e9d11ecbe9 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -736,6 +736,17 @@
       - python-jobs
       - pypi-jobs
 
+- project:
+    name: oslo.test
+    github-org: openstack
+    node: precise
+    tarball-site: tarballs.openstack.org
+    doc-publisher-site: docs.openstack.org
+
+    jobs:
+      - python-jobs
+      - openstack-publish-jobs
+      - pypi-jobs
 
 - project:
     name: oslo.version
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index a2bd216523..ffd6dccb4b 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -241,6 +241,10 @@
 - project: openstack/oslo.rootwrap
   docimpact-group: openstack-manuals
   upstream: git://github.com/ttx/oslo.rootwrap.git
+- project: openstack/oslo.test
+  description: OpenStack test classes
+  group: oslo
+  upstream: git://github.com/dhellmann/oslo.test.git
 - project: openstack/oslo.version
   docimpact-group: openstack-manuals
   upstream: git://github.com/emonty/oslo.version.git
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 487f84d212..1520bb3d6e 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1874,6 +1874,27 @@ projects:
           - post-mirror-python27
           - post-mirror-python33
 
+  - name: openstack/oslo.test
+    template:
+      - name: python-jobs
+      - name: openstack-server-publish-jobs
+    check:
+      - gate-oslo.test-python33
+      - gate-oslo.test-pypy
+      - gate-oslo.test-requirements
+    gate:
+      - gate-oslo.test-python33
+      - gate-oslo.test-pypy
+      - gate-oslo.test-requirements
+    pre-release:
+      - oslo.test-tarball
+    release:
+      - oslo.test-tarball:
+        - oslo.test-pypi-upload:
+          - post-mirror-python26
+          - post-mirror-python27
+          - post-mirror-python33
+
   - name: openstack/oslo.version
     template:
       - name: python-jobs