diff --git a/jenkins/jobs/neutron-fwaas.yaml b/jenkins/jobs/neutron-fwaas.yaml
index d03050734b..fb6de93b7e 100644
--- a/jenkins/jobs/neutron-fwaas.yaml
+++ b/jenkins/jobs/neutron-fwaas.yaml
@@ -188,3 +188,50 @@
       - test-results
       - devstack-logs
       - console-log
+
+
+- job-template:
+    name: '{pipeline}-neutron-fwaas-dsvm-fullstack-{node}{suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_UNSTACK=1
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_EXERCISES=0
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_INSTALL_TESTONLY=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          function gate_hook {{
+              bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-fullstack
+          }}
+          export -f gate_hook
+
+          function post_test_hook {{
+              bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-fullstack
+          }}
+          export -f post_test_hook
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - test-results
+      - devstack-logs
+      - console-log
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index e3ba8e2b44..813ddb41b2 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -7707,6 +7707,10 @@
           node: ubuntu-xenial-2-node
           branch-override: default
           suffix: '-nv'
+      - '{pipeline}-neutron-fwaas-dsvm-functional{suffix}':
+          pipeline: gate
+          branch-override: default
+          suffix: '-nv'
 
 - project:
     name: neutron-lbaas
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 2e64a3c331..aad9d99c18 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2255,6 +2255,9 @@ jobs:
   - name: ^gate-neutron-fwaas-v2-dsvm-tempest-multinode-nv$
     branch: ^(?!stable/(mitaka|newton)).*$
 
+  - name: ^gate-neutron-fwaas-dsvm-functional-nv$
+    branch: ^(?!stable/(mitaka|newton)).*$
+
   - name: ^gate-networking-sfc-functional-dsvm-ubuntu-trusty$
     branch: ^(stable/mitaka).*$
 
@@ -12329,6 +12332,8 @@ projects:
       - gate-neutron-fwaas-v1-dsvm-tempest
       - gate-neutron-fwaas-legacy-dsvm-tempest
       - gate-neutron-fwaas-dsvm-functional
+    experimental:
+      - gate-neutron-fwaas-dsvm-functional-nv
     post:
       - neutron-fwaas-coverage-ubuntu-trusty
       - neutron-fwaas-coverage-ubuntu-xenial