diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml
index fe40723..6be833a 100644
--- a/tests/bundles/trusty-mitaka.yaml
+++ b/tests/bundles/trusty-mitaka.yaml
@@ -25,7 +25,7 @@ applications:
     to:
       - '1'
   mongodb:
-    charm: cs:trusty/mongodb
+    charm: cs:trusty/mongodb-53
     num_units: 1
     to:
       - '2'
diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml
index ec91b3d..6868cf3 100644
--- a/tests/bundles/xenial-ocata.yaml
+++ b/tests/bundles/xenial-ocata.yaml
@@ -1,8 +1,6 @@
 options:
   source: &source cloud:xenial-ocata
-
 series: xenial
-
 machines:
   0: {}
   1: {}
@@ -12,11 +10,21 @@ machines:
   5: {}
   6: {}
   7: {}
-
+  8: {}
+  9: {}
+  10: {}
+  11: {}
+  12: {}
+  13: {}
+  14: {}
+  15: {}
 applications:
   percona-cluster:
     charm: cs:~openstack-charmers-next/percona-cluster
     num_units: 1
+    options:
+      max-connections: 1000
+      innodb-buffer-pool-size: 256M
     to:
       - '0'
   rabbitmq-server:
@@ -24,48 +32,79 @@ applications:
     num_units: 1
     to:
       - '1'
-  mongodb:
-    charm: cs:xenial/mongodb
+  memcached:
+    charm: cs:~memcached-team/memcached
     num_units: 1
     to:
       - '2'
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      source: *source
+    to:
+      - '3'
+      - '4'
+      - '5'
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      source: *source
+    to:
+      - '6'
+      - '7'
+      - '8'
   keystone:
     charm: cs:~openstack-charmers-next/keystone
     num_units: 1
     options:
       openstack-origin: *source
     to:
-      - '3'
+      - '9'
   glance:
     charm: cs:~openstack-charmers-next/glance
     num_units: 1
     options:
       openstack-origin: *source
     to:
-      - '4'
+      - '10'
   nova-cloud-controller:
     charm: cs:~openstack-charmers-next/nova-cloud-controller
     num_units: 1
     options:
       openstack-origin: *source
     to:
-      - '5'
+      - '11'
   nova-compute:
     charm: cs:~openstack-charmers-next/nova-compute
     num_units: 1
     options:
       openstack-origin: *source
     to:
-      - '6'
+      - '12'
   ceilometer:
     charm: cs:~openstack-charmers-next/ceilometer
     num_units: 1
     options:
       openstack-origin: *source
     to:
-      - '7'
+      - '13'
+  gnocchi:
+    charm: cs:~openstack-charmers-next/gnocchi
+    num_units: 1
+    options:
+      openstack-origin: *source
+    to:
+      - '14'
   ceilometer-agent: {}
-  
+  mongodb:
+    num_units: 1
+    charm: cs:xenial/mongodb
+    to:
+      - '15'
 relations:
 - - 'ceilometer:amqp'
   - 'rabbitmq-server:amqp'
@@ -73,6 +112,8 @@ relations:
   - 'keystone:identity-notifications'
 - - 'ceilometer:ceilometer-service'
   - 'ceilometer-agent:ceilometer-service'
+- - 'ceilometer:metric-service'
+  - 'gnocchi:metric-service'
 - - 'ceilometer:identity-service'
   - 'keystone:identity-service'
 - - 'ceilometer:shared-db'
@@ -103,3 +144,13 @@ relations:
   - 'nova-compute:cloud-compute'
 - - 'nova-cloud-controller:image-service'
   - 'glance:image-service'
+- - 'ceph-mon:osd'
+  - 'ceph-osd:mon'
+- - 'gnocchi:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'gnocchi:storage-ceph'
+  - 'ceph-mon:client'
+- - 'gnocchi:coordinator-memcached'
+  - 'memcached:cache'
+- - 'gnocchi:identity-service'
+  - 'keystone:identity-service'