diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
index c8aa7d1409..10ab0df124 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@@ -441,6 +441,41 @@
       - console-log
 
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-neutron-pg-full{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 125
+          fail: true
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_TESTR_FULL=1
+          export DEVSTACK_GATE_POSTGRES=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1
+          export DEVSTACK_GATE_CONFIGDRIVE=0
+          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}-devstack-dsvm-cells{branch-designator}'
     node: '{node}'
@@ -1431,6 +1466,7 @@
       - '{pipeline}-tempest-dsvm-neutron-isolated-parallel{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-dvr{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-full{branch-designator}'
+      - '{pipeline}-tempest-dsvm-neutron-pg-full{branch-designator}'
       - '{pipeline}-devstack-dsvm-cells{branch-designator}'
       - '{pipeline}-tempest-dsvm-cells{branch-designator}'
       - '{pipeline}-tempest-dsvm-cells-full{branch-designator}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index d7bd4f2b3c..06cf22a21a 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -286,16 +286,19 @@ project-templates:
 
   - name: integrated-gate-neutron
     check:
+      - 'check-tempest-dsvm-neutron-heat-slow'
       - 'check-tempest-dsvm-neutron'
       - 'check-tempest-dsvm-neutron-pg'
-      - 'check-tempest-dsvm-neutron-heat-slow'
       - 'check-tempest-dsvm-neutron-full'
+      - 'check-tempest-dsvm-neutron-pg-full'
       - 'gate-tempest-dsvm-neutron-large-ops'
       - 'check-grenade-dsvm-neutron'
     gate:
       - 'gate-tempest-dsvm-neutron'
       - 'gate-tempest-dsvm-neutron-pg'
       - 'gate-tempest-dsvm-neutron-heat-slow'
+      - 'gate-tempest-dsvm-neutron-full'
+      - 'gate-tempest-dsvm-neutron-pg-full'
       - 'gate-tempest-dsvm-neutron-large-ops'
 
   - name: integrated-gate-sahara
@@ -514,8 +517,13 @@ jobs:
     voting: false
   - name: gate-rally-dsvm-fakevirt-heat
     voting: false
-  - name: ^(gate|check)-tempest-dsvm-neutron-full$
+  - name: ^(gate|check)-tempest-dsvm-neutron-full(-2)?$
+    branch: ^(?!stable/(havana|icehouse)).*$
+  - name: ^(gate|check)-tempest-dsvm-neutron-pg-full(-2)?$
+    branch: ^(?!stable/(havana|icehouse)).*$
     voting: false
+  - name: ^(gate|check)-tempest-dsvm-neutron(-2)?$
+    branch: ^(stable/).*$
   - name: ^(gate|check)-tempest-dsvm-neutron-full-icehouse$
     voting: false
   - name: ^(gate|check)-tempest-dsvm-neutron-heat-slow
@@ -1178,10 +1186,14 @@ projects:
       - gate-rally-dsvm-neutron-neutron
       - check-tempest-dsvm-neutron-2
       - check-tempest-dsvm-neutron-pg-2
+      - check-tempest-dsvm-neutron-full-2
+      - check-tempest-dsvm-neutron-pg-full-2
     gate:
       - gate-neutron-dsvm-functional
       - gate-tempest-dsvm-neutron-2
       - gate-tempest-dsvm-neutron-pg-2
+      - gate-tempest-dsvm-neutron-full-2
+      - gate-tempest-dsvm-neutron-pg-full-2
     experimental:
       - check-neutron-dsvm-api
       - gate-grenade-dsvm-neutron-forward