diff --git a/jenkins/jobs/dragonflow.yaml b/jenkins/jobs/dragonflow.yaml
index 628ca1683e..f37e1ce95c 100644
--- a/jenkins/jobs/dragonflow.yaml
+++ b/jenkins/jobs/dragonflow.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-dsvm-dragonflow{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-dragonflow-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -43,7 +43,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-dragonflow-dsvm-rally{job-suffix}'
+    name: '{pipeline}-dragonflow-dsvm-rally-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -88,7 +88,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-dragonflow-dsvm-fullstack{job-suffix}'
+    name: '{pipeline}-dragonflow-dsvm-fullstack-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index fda5be3831..ef79ff20c4 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -4207,19 +4207,25 @@
           suffix: '-nv'
       - pypi-jobs
       - openstack-publish-jobs
-      - '{pipeline}-tempest-dsvm-dragonflow{job-suffix}':
+      - '{pipeline}-tempest-dsvm-dragonflow-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
-          job-suffix: ''
-          branch-override: default
-      - '{pipeline}-dragonflow-dsvm-rally{job-suffix}':
-          pipeline: gate
-          node: ubuntu-trusty
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-dragonflow-dsvm-fullstack{job-suffix}':
+      - '{pipeline}-dragonflow-dsvm-rally-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-xenial
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
+          job-suffix: '-nv'
+          branch-override: default
+      - '{pipeline}-dragonflow-dsvm-fullstack-{node}{job-suffix}':
+          pipeline: gate
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: '-nv'
           branch-override: default
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5229adcab3..438a0492d8 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2215,9 +2215,6 @@ jobs:
   - name: gate-tempest-dsvm-networking-onos
     voting: false
 
-  - name: ^gate-tempest-dsvm-dragonflow
-    voting: false
-
   - name: ^gate-tempest-dsvm-trove-ubuntu-(trusty|xenial)
     voting: false
 
@@ -8800,9 +8797,12 @@ projects:
       - name: python35-jobs-nv
     check:
       - gate-dragonflow-python34
-      - gate-tempest-dsvm-dragonflow
-      - gate-dragonflow-dsvm-rally-nv
-      - gate-dragonflow-dsvm-fullstack-nv
+      - gate-tempest-dsvm-dragonflow-ubuntu-trusty-nv
+      - gate-tempest-dsvm-dragonflow-ubuntu-xenial-nv
+      - gate-dragonflow-dsvm-rally-ubuntu-trusty-nv
+      - gate-dragonflow-dsvm-rally-ubuntu-xenial-nv
+      - gate-dragonflow-dsvm-fullstack-ubuntu-trusty-nv
+      - gate-dragonflow-dsvm-fullstack-ubuntu-xenial-nv
 
   - name: openstack/drbd-devstack
     template: