diff --git a/gerrit/acls/openstack/devstack-plugin-nfs.config b/gerrit/acls/openstack/devstack-plugin-nfs.config
new file mode 100644
index 0000000000..0a66381522
--- /dev/null
+++ b/gerrit/acls/openstack/devstack-plugin-nfs.config
@@ -0,0 +1,14 @@
+[access "refs/heads/*"]
+abandon = group devstack-plugin-nfs-core
+label-Code-Review = -2..+2 group devstack-plugin-nfs-core
+label-Workflow = -1..+1 group devstack-plugin-nfs-core
+
+[access "refs/tags/*"]
+pushSignedTag = group devstack-plugin-nfs-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 4086a29568..688b30f157 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -1278,6 +1278,8 @@
   acl-config: /home/gerrit2/acls/openstack/oslo.messaging.config
   groups:
     - oslo
+- project: openstack/devstack-plugin-nfs
+  description: DevStack plugin to configure NFS backend.
 - project: openstack/devstack-plugin-pika
   description: DevStack plugin to configure Pika RabbitMQ driver.
   acl-config: /home/gerrit2/acls/openstack/oslo.messaging.config
diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 91d8b5a5c0..dfd7131e6d 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -2297,6 +2297,40 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-full-devstack-plugin-nfs{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 180
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+
+          export PROJECTS="{plugin-repo} $PROJECTS"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-{plugin} git://git.openstack.org/{plugin-repo}"
+          export DEVSTACK_LOCAL_CONFIG+="ENABLE_NFS_CINDER=True"
+
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - devstack-logs
+      - console-log
+
 
 - job-template:
     name: '{pipeline}-tempest-dsvm-full-lio{job-suffix}'
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 4fff4e1d60..cbb4361b30 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1300,6 +1300,18 @@
           plugin-repo: openstack/devstack-plugin-kafka
           job-suffix: ''
 
+- project:
+    name: devstack-plugin-nfs
+    jobs:
+      - gate-{name}-bashate
+      - '{pipeline}-tempest-dsvm-full-devstack-plugin-nfs{job-suffix}':
+          node: ubuntu-trusty
+          pipeline: gate
+          plugin: nfs
+          plugin-repo: openstack/devstack-plugin-nfs
+          job-suffix: ''
+          branch-override: default
+
 - project:
     name: devstack-plugin-pika
     jobs:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0be9f0f834..2270914c03 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5040,6 +5040,17 @@ projects:
       - gate-devstack-plugin-kafka-bashate
       - gate-tempest-dsvm-full-kafka
 
+  - name: openstack/devstack-plugin-nfs
+    template:
+      - name: merge-check
+    check:
+      - gate-devstack-plugin-nfs-bashate
+      - gate-tempest-dsvm-full-devstack-plugin-nfs
+    gate:
+      - gate-devstack-plugin-nfs-bashate
+      - gate-tempest-dsvm-full-devstack-plugin-nfs
+
+
   - name: openstack/devstack-plugin-pika
     template:
       - name: merge-check