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 bef41f8d3d..953be61492 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
@@ -906,39 +906,6 @@
       - devstack-logs
       - console-log
 
-- job-template:
-    name: '{pipeline}-tempest-dsvm-nova-v3-full{branch-designator}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 125
-      - 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_FULL=1
-          export DEVSTACK_GATE_TEMPEST_NOVA_V3_API=1
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export OVERRIDE_TEMPEST_PROJECT_BRANCH=master
-          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-postgres-zeromq-full{branch-designator}'
     node: '{node}'
@@ -1605,6 +1572,5 @@
       - '{pipeline}-tempest-dsvm-neutron-full-non-isolated{branch-designator}'
       - '{pipeline}-tempest-dsvm-keystonev3-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-keystonev3-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-nova-v3-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-full-ceph{branch-designator}'
       - '{pipeline}-tempest-dsvm-full-newlibvirt{branch-designator}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 0abf91b5fd..ae1c46eb96 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -522,8 +522,6 @@ jobs:
     voting: false
   - name: ^(gate|check)-tempest-dsvm-cells-full$
     voting: false
-  - name: ^(gate|check)-tempest-dsvm-nova-v3-full$
-    branch: ^(?!stable/havana).*$
   - name: ^(gate|check)-grenade-dsvm$
     branch: ^(?!stable/havana).*$
   - name: ^(gate|check)-grenade-dsvm-neutron$
@@ -1293,7 +1291,6 @@ projects:
       - gate-grenade-dsvm-forward
       - check-tempest-dsvm-cells-full
       - check-tempest-dsvm-neutron-pg
-      - check-tempest-dsvm-nova-v3-full
       - gate-nova-pip-missing-reqs
       - check-tempest-dsvm-full-newlibvirt
     silent:
@@ -2544,7 +2541,6 @@ projects:
       - check-tempest-dsvm-zaqar
       - check-tempest-dsvm-keystonev3-full
       - check-tempest-dsvm-neutron-keystonev3-full
-      - check-tempest-dsvm-nova-v3-full
       - gate-tempest-dsvm-ceilometer-mongodb
       - gate-tempest-dsvm-ceilometer-mongodb-full
       - check-tempest-dsvm-full-non-isolated
@@ -2576,7 +2572,6 @@ projects:
       - periodic-tempest-dsvm-neutron-full-non-isolated-master
       - periodic-tempest-dsvm-all-master
       - periodic-tempest-dsvm-stress-master
-      - periodic-tempest-dsvm-nova-v3-full-master
 
   - name: openstack/tempest-lib
     template:
@@ -2615,7 +2610,6 @@ projects:
       - gate-grenade-dsvm-forward
       - check-tempest-dsvm-keystonev3-full
       - check-tempest-dsvm-neutron-keystonev3-full
-      - check-tempest-dsvm-nova-v3-full
     post:
       - tempest-lib-docs
       - tempest-lib-coverage