diff --git a/tests/functional/lvm-osds/hosts b/tests/functional/lvm-osds/hosts
index 32da771c9..18e1478da 100644
--- a/tests/functional/lvm-osds/hosts
+++ b/tests/functional/lvm-osds/hosts
@@ -1,11 +1,13 @@
 [mons]
 mon0
+mon1
+mon2
 
 [mgrs]
 mon0
 
 [osds]
-osd0 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/dev/sdc1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'journal': 'journal1', 'journal_vg': 'journals'}]"
-osd1 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/dev/sdc1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'journal': 'journal1', 'journal_vg': 'journals'}]" dmcrypt=true
-osd2 osd_objectstore=bluestore lvm_volumes="[{'data': 'data-lv1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'db': 'journal1', 'db_vg': 'journals'}]"
-osd3 osd_objectstore=bluestore lvm_volumes="[{'data': 'data-lv1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group'}]" dmcrypt=true
+osd0 osd_objectstore=filestore osd_scenario=non-collocated devices="['/dev/sda']" dedicated_devices="['/dev/sdc']"
+osd1 osd_objectstore=filestore osd_scenario=non-collocated devices="['/dev/sda']" dedicated_devices="['/dev/sdc']"
+osd2 osd_objectstore=filestore osd_scenario=non-collocated devices="['/dev/sda']" dedicated_devices="['/dev/sdc']"
+osd3 osd_objectstore=filestore osd_scenario=non-collocated devices="['/dev/sda']" dedicated_devices="['/dev/sdc']"
diff --git a/tests/functional/lvm-osds/vagrant_variables.yml b/tests/functional/lvm-osds/vagrant_variables.yml
index d2a5ee12e..ec59ad318 100644
--- a/tests/functional/lvm-osds/vagrant_variables.yml
+++ b/tests/functional/lvm-osds/vagrant_variables.yml
@@ -4,7 +4,7 @@
 docker: false
 
 # DEFINE THE NUMBER OF VMS TO RUN
-mon_vms: 1
+mon_vms: 3
 osd_vms: 4
 mds_vms: 0
 rgw_vms: 0