diff --git a/jenkins/jobs/group-based-policy.yaml b/jenkins/jobs/group-based-policy.yaml
index 51ab5ca279..05a34a3f3e 100644
--- a/jenkins/jobs/group-based-policy.yaml
+++ b/jenkins/jobs/group-based-policy.yaml
@@ -46,6 +46,54 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-group-based-policy-dsvm-nfp{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - 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 PROJECTS="openstack/group-based-policy $PROJECTS"
+          export PROJECTS="openstack/group-based-policy-automation $PROJECTS"
+          export PROJECTS="openstack/group-based-policy-ui $PROJECTS"
+          export PROJECTS="openstack/python-group-based-policy-client $PROJECTS"
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          function gate_hook {{
+              bash -xe $BASE/new/group-based-policy/gbpservice/tests/contrib/gate_nfp_hook.sh dsvm-nfp
+          }}
+          export -f gate_hook
+
+          function post_test_hook {{
+             bash -xe $BASE/new/group-based-policy/gbpservice/tests/contrib/post_test_nfp_hook.sh dsvm-nfp
+          }}
+          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
+
 - job-template:
     name: '{pipeline}-group-based-policy-dsvm-rally{job-suffix}'
     node: '{node}'
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 8eac8dfbac..f014c32e25 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -2692,6 +2692,11 @@
           node: ubuntu-trusty
           job-suffix: ''
           branch-override: default
+      - '{pipeline}-group-based-policy-dsvm-nfp{job-suffix}':
+          pipeline: gate
+          node: ubuntu-trusty
+          job-suffix: '-nv'
+          branch-override: default
       - '{pipeline}-group-based-policy-dsvm-rally{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 02b98e8900..bcd95d14e4 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7071,6 +7071,7 @@ projects:
       - name: publish-to-pypi
     check:
       - gate-group-based-policy-dsvm-functional
+      - gate-group-based-policy-dsvm-nfp-nv
       - gate-group-based-policy-dsvm-rally
 
   - name: openstack/group-based-policy-automation