diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 046de6286e..3b16f11759 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -13264,14 +13264,6 @@
           datastore: 'mysql'
           job-suffix: ''
           branch-override: default
-      - 'gate-trove-scenario-functional-dsvm-{datastore}{job-suffix}':
-          datastore: 'redis'
-          job-suffix: ''
-          branch-override: default
-      - 'gate-trove-scenario-functional-dsvm-{datastore}{job-suffix}':
-          datastore: 'mysql'
-          job-suffix: ''
-          branch-override: default
       - 'gate-trove-functional-dsvm-{datastore}{job-suffix}':
           datastore: 'mysql'
           job-suffix: '-liberty'
@@ -13280,6 +13272,24 @@
           datastore: 'mysql'
           job-suffix: '-mitaka'
           branch-override: stable/mitaka
+      - 'gate-trove-scenario-functional-dsvm-{datastore}{job-suffix}':
+          job-suffix: ''
+          branch-override: default
+          datastore:
+            - mysql
+            - redis
+      - 'gate-trove-scenario-functional-dsvm-{datastore}{job-suffix}':
+          job-suffix: '-nv'
+          branch-override: default
+          datastore:
+            - cassandra
+            - couchbase
+            - couchdb
+            - mariadb
+            - mongodb
+            - percona
+            - postgresql
+            - pxc
       - 'gate-trove-buildimage-{datastore}':
           datastore: 'mysql'
       - 'gate-trove-buildimage-{datastore}':
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index ecb674087d..ede6f4af12 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2712,10 +2712,7 @@ jobs:
   - name: gate-trove-buildimage-percona
     voting: false
 
-  - name: gate-trove-scenario-functional-dsvm-mysql
-    branch: ^(?!stable/(liberty|mitaka)).*$
-
-  - name: gate-trove-scenario-functional-dsvm-redis
+  - name: ^gate-trove-scenario-functional-dsvm-.*$
     branch: ^(?!stable/(liberty|mitaka)).*$
 
   - name: gate-trove-python34-db
@@ -15823,16 +15820,24 @@ projects:
     check:
       - gate-trove-functional-dsvm-mysql
       - gate-tempest-dsvm-trove
-      - gate-trove-scenario-functional-dsvm-redis
+      - gate-trove-scenario-functional-dsvm-mariadb-nv
       - gate-trove-scenario-functional-dsvm-mysql
+      - gate-trove-scenario-functional-dsvm-postgresql-nv
+      - gate-trove-scenario-functional-dsvm-pxc-nv
+      - gate-trove-scenario-functional-dsvm-redis
     gate:
       - gate-trove-functional-dsvm-mysql
-      - gate-trove-scenario-functional-dsvm-redis
       - gate-trove-scenario-functional-dsvm-mysql
+      - gate-trove-scenario-functional-dsvm-redis
     post:
       - trove-coverage-db-ubuntu-trusty
       - trove-coverage-db-ubuntu-xenial
     experimental:
+      - gate-trove-scenario-functional-dsvm-cassandra-nv
+      - gate-trove-scenario-functional-dsvm-couchbase-nv
+      - gate-trove-scenario-functional-dsvm-couchdb-nv
+      - gate-trove-scenario-functional-dsvm-mongodb-nv
+      - gate-trove-scenario-functional-dsvm-percona-nv
       - gate-grenade-dsvm-trove
 
   - name: openstack/trove-dashboard