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 e0e50e3ac3..0d3ca1130a 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
@@ -125,6 +125,38 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-tempest-master-dsvm-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_FULL=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          export OVERRIDE_TEMPEST_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-full-non-isolated{branch-designator}'
     node: '{node}'
@@ -187,6 +219,7 @@
       - devstack-logs
       - console-log
 
+
 - job-template:
     name: '{pipeline}-tempest-dsvm-neutron-heat-slow{branch-designator}'
     node: '{node}'
@@ -253,6 +286,40 @@
       - console-log
 
 
+- job-template:
+    name: '{pipeline}-tempest-master-dsvm-neutron{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_NEUTRON=1
+          export DEVSTACK_GATE_SMOKE_SERIAL=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          export OVERRIDE_TEMPEST_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-neutron-pg{branch-designator}'
     node: '{node}'
@@ -1182,7 +1249,9 @@
     name: devstack-jobs
     jobs:
       - '{pipeline}-tempest-dsvm-full{branch-designator}'
+      - '{pipeline}-tempest-master-dsvm-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron{branch-designator}'
+      - '{pipeline}-tempest-master-dsvm-neutron{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-pg{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-isolated{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-isolated-parallel{branch-designator}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 0263b0daaf..9906f6e263 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -447,6 +447,8 @@ jobs:
     voting: false
   - name: gate-kite-python33
     voting: false
+  - name: ^(gate|check)-tempest-master
+    voting: false
   - name: gate-keystone-python33
     voting: false
   - name: gate-marconi-python33
@@ -2154,8 +2156,8 @@ projects:
       - check-tempest-dsvm-sahara-full-nv
       - check-tempest-dsvm-sahara-postgres-nv
       - check-tempest-dsvm-sahara-neutron-nv
-      - check-tempest-dsvm-full-havana
-      - check-tempest-dsvm-neutron-havana
+      - check-tempest-master-dsvm-full-havana
+      - check-tempest-master-dsvm-neutron-havana
     gate:
       - gate-tempest-pep8
       - gate-tempest-docs
@@ -2397,6 +2399,8 @@ projects:
       - check-tempest-dsvm-sahara-full-nv
       - check-tempest-dsvm-sahara-postgres-nv
       - check-tempest-dsvm-sahara-neutron-nv
+      - check-tempest-master-dsvm-full-havana
+      - check-tempest-master-dsvm-neutron-havana
     gate:
       - gate-devstack-bash8
       - gate-devstack-dsvm-cells
@@ -2607,6 +2611,8 @@ projects:
       - check-tempest-dsvm-sahara-full-nv
       - check-tempest-dsvm-sahara-postgres-nv
       - check-tempest-dsvm-sahara-neutron-nv
+      - check-tempest-master-dsvm-full-havana
+      - check-tempest-master-dsvm-neutron-havana
     gate:
       - gate-devstack-gate-unittests
       - gate-devstack-dsvm-cells