diff --git a/generic/tests/cfg/lvm.cfg b/generic/tests/cfg/lvm.cfg
index 7b9297051069e1953eb863228fa171468abbf61a..1ceb2d208e8ad638b76b384a006a8e4e1bb3e1f9 100644
--- a/generic/tests/cfg/lvm.cfg
+++ b/generic/tests/cfg/lvm.cfg
@@ -11,7 +11,6 @@
     image_size_stg2 = 1G
     image_format_stg2 = qcow2
     guest_testdir = /mnt
-    disks = "/dev/sdb /dev/sdc"
     kill_vm = no
     post_command_noncritical = no
     variants:
diff --git a/generic/tests/lvm.py b/generic/tests/lvm.py
index 5867acc30563050912baea1476eb1d8932ec755d..d40ba6dd1c01c0b403ceaac80d9d657b29fa47f3 100644
--- a/generic/tests/lvm.py
+++ b/generic/tests/lvm.py
@@ -40,9 +40,11 @@ def run(test, params, env):
     vg_name = "vg_kvm_test"
     lv_name = "lv_kvm_test"
     lv_path = "/dev/%s/%s" % (vg_name, lv_name)
-    disks = params.get("disks", "/dev/hdb /dev/hdc")
     clean = params.get("clean", "yes")
     timeout = params.get("lvm_timeout", "600")
+    output = session.cmd_output("ls /dev/[hvs]da")
+    disk_prefix = output.strip()[:len('/dev/hd')]
+    disks = "%sb %sc" % (disk_prefix, disk_prefix)
 
     try:
         error.context("adding physical volumes %s" % disks, logging.info)