diff --git a/gerrit/acls/openstack/manila-test-image.config b/gerrit/acls/openstack/manila-test-image.config
new file mode 100644
index 0000000000..3b946fc90a
--- /dev/null
+++ b/gerrit/acls/openstack/manila-test-image.config
@@ -0,0 +1,14 @@
+[access "refs/heads/*"]
+abandon = group manila-core
+create = group manila-core
+label-Code-Review = -2..+2 group manila-core
+label-Workflow = -1..+1 group manila-core
+
+[access "refs/tags/*"]
+pushSignedTag = group manila-release
+
+[receive]
+requireChangeId = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index d99cb0f4c7..4f7f2d94e7 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -4647,6 +4647,11 @@
   groups:
     - manila
   description: Specs repo for Manila (OpenStack Shared File Systems) project.
+- project: openstack/manila-test-image
+  groups:
+    - manila
+  description: Images for testing Manila (infrastructure project)
+  upstream: https://github.com/bswartz/manila-test-image.git
 - project: openstack/manila-ui
   description: The UI component for Manila
   options:
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 521d785b0a..8d24c91c09 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -1098,6 +1098,7 @@ openstack-manila:
     - openstack/manila
     - openstack/manila-image-elements
     - openstack/manila-specs
+    - openstack/manila-test-image
     - openstack/manila-ui
     - openstack/puppet-manila
     - openstack/python-manilaclient
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 7da97defe9..869f184758 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -6580,6 +6580,13 @@
     jobs:
       - specs-jobs
 
+- project:
+    name: manila-test-image
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - gate-{name}-bashate
+
 - project:
     name: manila-ui
     tarball-site: tarballs.openstack.org
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4d21f00789..0c40e1c477 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -10897,6 +10897,14 @@ projects:
     gate:
       - gate-manila-specs-python27-ubuntu-xenial
 
+  - name: openstack/manila-test-image
+    template:
+      - name: merge-check
+    check:
+      - gate-manila-test-image-bashate
+    gate:
+      - gate-manila-test-image-bashate
+
   - name: openstack/manila-ui
     template:
       - name: check-requirements