diff --git a/jenkins/jobs/monasca.yaml b/jenkins/jobs/monasca.yaml
index 54bfdd3f42..963a4b835e 100644
--- a/jenkins/jobs/monasca.yaml
+++ b/jenkins/jobs/monasca.yaml
@@ -100,24 +100,20 @@
 - job-group:
     name: 'tempest-monasca-full-jobs'
     jobs:
-      - 'gate-tempest-dsvm-monasca-python-full-{node}{job-suffix}':
-          node:
-            - 'ubuntu-trusty'
-          job-suffix: ''
       - 'gate-tempest-dsvm-monasca-python-full-{node}{job-suffix}':
           node:
             - 'ubuntu-trusty'
             - 'ubuntu-xenial'
-          job-suffix: '-nv'
-      - 'gate-tempest-dsvm-monasca-java-full-{node}{job-suffix}':
-          node:
-            - 'ubuntu-trusty'
-          job-suffix: ''
+          job-suffix:
+            - ''
+            - '-nv'
       - 'gate-tempest-dsvm-monasca-java-full-{node}{job-suffix}':
           node:
             - 'ubuntu-trusty'
             - 'ubuntu-xenial'
-          job-suffix: '-nv'
+          job-suffix:
+            - ''
+            - '-nv'
 
 - job-template:
     name: 'gate-tempest-dsvm-monasca-log-api-{node}{suffix}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4c8bc9302e..f72cb72721 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3452,14 +3452,6 @@ jobs:
     branch: master
     voting: false
 
-  # Run Monasca tempest tests for trusty on all branches. New tests for xenial
-  # only on master.
-  - name: ^gate-tempest-dsvm-monasca-(python|java)-full-ubuntu-trusty.*$
-    branch: ^(stable/(mitaka|newton)|master)$
-
-  - name: ^gate-tempest-dsvm-monasca-(python|java)-full-ubuntu-xenial.*$
-    branch: master
-
   # Make sure we do not match openstack-ansible jobs, as they have their own
   # rules.
   - name: ^gate-(?!openstack-ansible).*(-dsvm)?-ansible-func-ubuntu-trusty(-nv)?$
@@ -11239,6 +11231,8 @@ projects:
       - gate-monasca-agent-python27-ubuntu-xenial
       - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
       - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
     gate:
       - gate-monasca-agent-pep8-ubuntu-trusty
       - gate-monasca-agent-python27-ubuntu-trusty
@@ -11272,6 +11266,8 @@ projects:
       - gate-monasca-api-build
       - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
       - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial
     gate:
       - gate-monasca-api-pep8-ubuntu-trusty
       - gate-monasca-api-python27-ubuntu-trusty
@@ -11280,11 +11276,10 @@ projects:
       - gate-monasca-api-build
       - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
       - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial
     post:
       - monasca-api-localrepo-upload
-    experimental:
-      - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv
-      - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
 
   - name: openstack/monasca-ceilometer
     template:
@@ -11313,6 +11308,8 @@ projects:
       - gate-monasca-common-build
       - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
       - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
     gate:
       - gate-monasca-common-pep8-ubuntu-trusty
       - gate-monasca-common-python27-ubuntu-trusty
@@ -11373,6 +11370,8 @@ projects:
       - gate-monasca-notification-python27-ubuntu-xenial
       - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
       - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
     gate:
       - gate-monasca-notification-pep8-ubuntu-trusty
       - gate-monasca-notification-python27-ubuntu-trusty
@@ -11392,6 +11391,8 @@ projects:
       - gate-monasca-persister-build
       - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
       - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
     gate:
       - gate-monasca-persister-pep8-ubuntu-trusty
       - gate-monasca-persister-python27-ubuntu-trusty
@@ -11399,6 +11400,7 @@ projects:
       - gate-monasca-persister-python27-ubuntu-xenial
       - gate-monasca-persister-build
       - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial
     post:
       - monasca-persister-localrepo-upload
 
@@ -11414,6 +11416,8 @@ projects:
       - gate-monasca-statsd-python27-ubuntu-xenial
       - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
       - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
     gate:
       - gate-monasca-statsd-pep8-ubuntu-trusty
       - gate-monasca-statsd-python27-ubuntu-trusty
@@ -11427,6 +11431,8 @@ projects:
       - gate-monasca-thresh-build
       - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
       - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
+      - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv
+      - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
     gate:
       - gate-monasca-thresh-build
     post: