diff --git a/test/shell/pvmove-restart.sh b/test/shell/pvmove-restart.sh
index f480aaa15..dde7308e6 100644
--- a/test/shell/pvmove-restart.sh
+++ b/test/shell/pvmove-restart.sh
@@ -39,8 +39,9 @@ kill -9 $PVMOVE
 wait
 
 # Simulate reboot - forcibly remove related devices
+dmsetup table
 dmsetup remove $vg-$lv1
-dmsetup remove /dev/mapper/$vg-pvmove0*
+dmsetup remove "$DM_DEV_DIR/mapper/$vg-pvmove0*"
 
 # Check we really have pvmove volume
 check lv_attr_bit type $vg/pvmove0 "p"