diff --git a/jenkins/jobs/gce-api.yaml b/jenkins/jobs/gce-api.yaml
index 4bdf8c1601..c2fcf6a309 100644
--- a/jenkins/jobs/gce-api.yaml
+++ b/jenkins/jobs/gce-api.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-functional-neutron-dsvm-gceapi{job-suffix}'
+    name: '{pipeline}-functional-neutron-dsvm-gceapi-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -39,7 +39,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-functional-nova-network-dsvm-gceapi{job-suffix}'
+    name: '{pipeline}-functional-nova-network-dsvm-gceapi-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index c32c01feea..629780ac2a 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -4871,15 +4871,19 @@
     jobs:
       - python-jobs
       - pypi-jobs
-      - '{pipeline}-functional-neutron-dsvm-gceapi{job-suffix}':
+      - '{pipeline}-functional-neutron-dsvm-gceapi-{node}{job-suffix}':
             pipeline: gate
-            node: ubuntu-trusty
-            job-suffix: ''
+            node:
+              - ubuntu-trusty
+              - ubuntu-xenial
+            job-suffix: '-nv'
             branch-override: default
-      - '{pipeline}-functional-nova-network-dsvm-gceapi{job-suffix}':
+      - '{pipeline}-functional-nova-network-dsvm-gceapi-{node}{job-suffix}':
             pipeline: gate
-            node: ubuntu-trusty
-            job-suffix: ''
+            node:
+              - ubuntu-trusty
+              - ubuntu-xenial
+            job-suffix: '-nv'
             branch-override: default
 
 - project:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c15b1f044d..4922a0fce9 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2017,12 +2017,6 @@ jobs:
   - name: gate-neutron-dsvm-tempest-vpnaas
     branch: ^(?!stable/liberty).*$
 
-  - name: gate-functional-neutron-dsvm-gceapi
-    voting: false
-
-  - name: gate-functional-nova-network-dsvm-gceapi
-    voting: false
-
   - name: gate-python-magnumclient-python34
     branch: ^(?!stable/liberty).*$
 
@@ -9894,8 +9888,10 @@ projects:
       - name: check-requirements
       - name: publish-to-pypi
     check:
-      - gate-functional-neutron-dsvm-gceapi
-      - gate-functional-nova-network-dsvm-gceapi
+      - gate-functional-neutron-dsvm-gceapi-ubuntu-trusty-nv
+      - gate-functional-neutron-dsvm-gceapi-ubuntu-xenial-nv
+      - gate-functional-nova-network-dsvm-gceapi-ubuntu-trusty-nv
+      - gate-functional-nova-network-dsvm-gceapi-ubuntu-xenial-nv
 
   - name: openstack/gerrit-dash-creator
     template: