diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 6e1143798d..f029888b11 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -2240,6 +2240,8 @@
       - '{pipeline}-tempest-dsvm-full-test-accounts-{node}{job-suffix}'
       - '{pipeline}-tempest-dsvm-neutron-full-non-admin-{node}{job-suffix}'
       - '{pipeline}-tempest-dsvm-neutron-full-test-accounts-{node}{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-scenario-{node}{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-scenario-linuxbridge-{node}{job-suffix}'
       - '{pipeline}-tempest-dsvm-lxc-{node}{job-suffix}'
       # NOTE(mriedem): gate-grenade-dsvm-ubuntu-xenial is intentionally omitted
       # from this list as stable/newton grenade jobs upgrade from trusty nodes
@@ -2272,8 +2274,6 @@
       - '{pipeline}-tempest-dsvm-neutron-full-{node}{job-suffix}'
       - '{pipeline}-tempest-dsvm-neutron-ovs-native-{node}{job-suffix}'
       - '{pipeline}-tempest-dsvm-neutron-pg-full-{node}{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-scenario{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-scenario-linuxbridge{job-suffix}'
       - '{pipeline}-tempest-dsvm-nova-v20-api{job-suffix}'
       - '{pipeline}-tempest-dsvm-nova-wsgi-full{job-suffix}'
       - '{pipeline}-tempest-dsvm-smoke-tlsproxy{job-suffix}'
diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml
index 5cbdff3334..75aed211d4 100644
--- a/jenkins/jobs/neutron.yaml
+++ b/jenkins/jobs/neutron.yaml
@@ -479,7 +479,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-scenario-linuxbridge{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-scenario-linuxbridge-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -603,7 +603,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-scenario{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-scenario-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4ce6218ea8..b61cac25f4 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3374,8 +3374,7 @@ jobs:
   - name: gate-tempest-dsvm-neutron-full-ssh
     voting: false
 
-  - name: gate-tempest-dsvm-neutron-scenario
-    branch: ^(?!stable/(liberty|mitaka)).*$
+  - name: ^gate-tempest-dsvm-neutron-scenario(-linuxbridge)?-ubuntu-xenial$
     voting: false
 
   - name: ^gate-.*-releasenotes$
@@ -12229,8 +12228,8 @@ projects:
       - neutron-coverage-ubuntu-trusty
       - neutron-coverage-ubuntu-xenial
     experimental:
-      - gate-tempest-dsvm-neutron-scenario
-      - gate-tempest-dsvm-neutron-scenario-linuxbridge
+      - gate-tempest-dsvm-neutron-scenario-ubuntu-xenial
+      - gate-tempest-dsvm-neutron-scenario-linuxbridge-ubuntu-xenial
       - gate-tempest-dsvm-neutron-dvr-multinode-scenario-ubuntu-xenial-nv
       - gate-grenade-dsvm-neutron-forward
       - gate-neutron-vpnaas-dsvm-functional