diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml
index 8bc49b32..3cd188f1 100644
--- a/tests/bundles/bionic-queens.yaml
+++ b/tests/bundles/bionic-queens.yaml
@@ -4,7 +4,7 @@ applications:
     charm: cs:~openstack-charmers-next/ceph-osd
     num_units: 3
     storage:
-      osd-devices: 'cinder,10G'
+      osd-devices: '10G'
     options:
       osd-devices: '/srv/ceph /dev/test-non-existent'
   ceph-mon:
diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml
index 7e165bde..1ea79374 100644
--- a/tests/bundles/bionic-rocky.yaml
+++ b/tests/bundles/bionic-rocky.yaml
@@ -4,7 +4,7 @@ applications:
     charm: cs:~openstack-charmers-next/ceph-osd
     num_units: 3
     storage:
-      osd-devices: 'cinder,10G'
+      osd-devices: '10G'
     options:
       osd-devices: '/srv/ceph /dev/test-non-existent'
       source: cloud:bionic-rocky
diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml
index 56695dd7..e71dcd68 100644
--- a/tests/bundles/bionic-stein.yaml
+++ b/tests/bundles/bionic-stein.yaml
@@ -4,7 +4,7 @@ applications:
     charm: cs:~openstack-charmers-next/ceph-osd
     num_units: 3
     storage:
-      osd-devices: 'cinder,10G'
+      osd-devices: '10G'
     options:
       osd-devices: '/srv/ceph /dev/test-non-existent'
       source: cloud:bionic-stein
diff --git a/tests/bundles/bionic-train-with-fsid.yaml b/tests/bundles/bionic-train-with-fsid.yaml
index 5729dfe4..418064e2 100644
--- a/tests/bundles/bionic-train-with-fsid.yaml
+++ b/tests/bundles/bionic-train-with-fsid.yaml
@@ -4,7 +4,7 @@ applications:
     charm: cs:~openstack-charmers-next/ceph-osd
     num_units: 3
     storage:
-      osd-devices: 'cinder,10G'
+      osd-devices: '10G'
     options:
       osd-devices: '/dev/test-non-existent'
       source: cloud:bionic-train/proposed
diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml
index 1b270900..7535683d 100644
--- a/tests/bundles/bionic-train.yaml
+++ b/tests/bundles/bionic-train.yaml
@@ -5,7 +5,7 @@ applications:
     num_units: 3
     series: bionic
     storage:
-      osd-devices: 'cinder,10G'
+      osd-devices: '10G'
     options:
       osd-devices: '/dev/test-non-existent'
       source: cloud:bionic-train
diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml
index bf56d66f..0fc7c3e0 100644
--- a/tests/bundles/trusty-mitaka.yaml
+++ b/tests/bundles/trusty-mitaka.yaml
@@ -4,7 +4,7 @@ applications:
     charm: cs:~openstack-charmers-next/ceph-osd
     num_units: 3
     storage:
-      osd-devices: 'cinder,10G'
+      osd-devices: '10G'
     options:
       osd-devices: '/srv/ceph /dev/test-non-existent'
       source: cloud:trusty-mitaka
diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml
index a9e28cc1..c7a987bc 100644
--- a/tests/bundles/xenial-mitaka.yaml
+++ b/tests/bundles/xenial-mitaka.yaml
@@ -4,7 +4,7 @@ applications:
     charm: cs:~openstack-charmers-next/ceph-osd
     num_units: 3
     storage:
-      osd-devices: 'cinder,10G'
+      osd-devices: '10G'
     options:
       osd-devices: '/srv/ceph /dev/test-non-existent'
   ceph-mon:
diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml
index 6187a500..12d17dd6 100644
--- a/tests/bundles/xenial-ocata.yaml
+++ b/tests/bundles/xenial-ocata.yaml
@@ -4,7 +4,7 @@ applications:
     charm: cs:~openstack-charmers-next/ceph-osd
     num_units: 3
     storage:
-      osd-devices: 'cinder,10G'
+      osd-devices: '10G'
     options:
       osd-devices: '/srv/ceph /dev/test-non-existent'
       source: cloud:xenial-ocata
diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml
index 8d31f272..bdefea27 100644
--- a/tests/bundles/xenial-pike.yaml
+++ b/tests/bundles/xenial-pike.yaml
@@ -4,7 +4,7 @@ applications:
     charm: cs:~openstack-charmers-next/ceph-osd
     num_units: 3
     storage:
-      osd-devices: 'cinder,10G'
+      osd-devices: '10G'
     options:
       osd-devices: '/srv/ceph /dev/test-non-existent'
       source: cloud:xenial-pike
diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml
index ab12215e..ad747d3f 100644
--- a/tests/bundles/xenial-queens.yaml
+++ b/tests/bundles/xenial-queens.yaml
@@ -4,7 +4,7 @@ applications:
     charm: cs:~openstack-charmers-next/ceph-osd
     num_units: 3
     storage:
-      osd-devices: 'cinder,10G'
+      osd-devices: '10G'
     options:
       osd-devices: '/srv/ceph /dev/test-non-existent'
       source: cloud:xenial-queens