diff --git a/test/shell/lvcreate-signature-wiping.sh b/test/shell/lvcreate-signature-wiping.sh
index 561878049..be06bce31 100644
--- a/test/shell/lvcreate-signature-wiping.sh
+++ b/test/shell/lvcreate-signature-wiping.sh
@@ -13,9 +13,7 @@
 
 . lib/test
 
-aux prepare_devs 1
-aux pvcreate -f $dev1
-aux vgcreate $vg $dev1
+aux prepare_vg
 
 # lvcreate wipes signatures when found on newly created LV - test this on "swap".
 # Test all combinatios with -Z{y|n} and -W{y|n} and related lvm.conf settings.
@@ -92,6 +90,4 @@ mkswap "$DM_DEV_DIR/$vg/$lv1"
 blkid -c /dev/null "$DM_DEV_DIR/$vg/$lv1" | grep "swap"
 lvremove -f $vg/$lv1
 
-
-vgremove $vg
-pvremove $dev1
+vgremove -f $vg
diff --git a/test/shell/thin-merge.sh b/test/shell/thin-merge.sh
index 7eb137e73..60234a6bc 100644
--- a/test/shell/thin-merge.sh
+++ b/test/shell/thin-merge.sh
@@ -76,7 +76,6 @@ lvchange -an $vg/$lv1
 not lvchange -K -ay $vg/snap
 
 lvs -a -o +tags,thin_id $vg
-dmsetup table
 
 # Test if merge happens
 lvchange -ay $vg/$lv1