diff --git a/test/shell/lvconvert-snapshot-cache.sh b/test/shell/lvconvert-snapshot-cache.sh
index 0d9c9c6f4..d32f4c237 100644
--- a/test/shell/lvconvert-snapshot-cache.sh
+++ b/test/shell/lvconvert-snapshot-cache.sh
@@ -58,13 +58,13 @@ grep "lv_is_visible" err
 
 # Cannot use thin-pool, _tdata, _tmeta as origin
 not lvconvert --yes --type snapshot $vg/cpool $vg/cow 2>&1 | tee err
-grep "invalid" err
+grep "not supported" err
 
 not lvconvert --yes --type snapshot $vg/cpool_cdata $vg/cow 2>&1 | tee err
-grep "invalid" err
+grep "not supported" err
 
 not lvconvert --yes --type snapshot $vg/cpool_cmeta $vg/cow 2>&1 | tee err
-grep "invalid" err
+grep "not supported" err
 
 lvconvert --yes -s $vg/ch $vg/cow
 
diff --git a/test/shell/lvconvert-snapshot-mirror.sh b/test/shell/lvconvert-snapshot-mirror.sh
index 01c19d9ca..22f40f77b 100644
--- a/test/shell/lvconvert-snapshot-mirror.sh
+++ b/test/shell/lvconvert-snapshot-mirror.sh
@@ -42,11 +42,11 @@ grep "lv_is_visible" err
 
 # cannot use _mimage
 not lvconvert --yes --type snapshot $vg/mir_mimage_0 $vg/cow 2>&1 | tee err
-grep "invalid" err
+grep "not supported" err
 
 # cannot use _mlog
 not lvconvert --yes --type snapshot $vg/mir_mlog $vg/cow 2>&1 | tee err
-grep "invalid" err
+grep "not supported" err
 
 lvconvert --yes -s $vg/mir $vg/cow
 
diff --git a/test/shell/lvconvert-snapshot-raid.sh b/test/shell/lvconvert-snapshot-raid.sh
index 91bcd9443..8deb60fff 100644
--- a/test/shell/lvconvert-snapshot-raid.sh
+++ b/test/shell/lvconvert-snapshot-raid.sh
@@ -44,11 +44,11 @@ grep "lv_is_visible" err
 
 # Cannot use _rimage
 not lvconvert --yes --type snapshot $vg/rd_rimage_0 $vg/cow 2>&1 | tee err
-grep "invalid" err
+grep "not supported" err
 
 # Cannot use _rmeta
 not lvconvert --yes --type snapshot $vg/rd_rmeta_0 $vg/cow 2>&1 | tee err
-grep "invalid" err
+grep "not supported" err
 
 lvconvert --yes -s $vg/rd $vg/cow
 
diff --git a/test/shell/lvconvert-snapshot-thin.sh b/test/shell/lvconvert-snapshot-thin.sh
index ef1218bae..f5da459b3 100644
--- a/test/shell/lvconvert-snapshot-thin.sh
+++ b/test/shell/lvconvert-snapshot-thin.sh
@@ -29,6 +29,7 @@ lvcreate -L1 -n cow $vg
 
 # Thin and snapshot conversion
 lvcreate -T -L1 -V10 -n th $vg/pool
+eval $(lvs -S 'name=~_pmspare' -a -o name --config 'report/mark_hidden_devices=0' --noheading --nameprefixes $vg)
 
 # Cannot create snapshot of pool's meta
 not lvcreate -s -L1 $vg/pool_tmeta 2>&1 | tee err
@@ -45,6 +46,9 @@ grep "not accept" err
 not lvconvert --yes --type snapshot $vg/cow $vg/pool 2>&1 | tee err
 grep "not accept" err
 
+not lvconvert --yes --type snapshot $vg/cow $vg/$LVM2_LV_NAME 2>&1 | tee err
+grep "lv_is_visible" err
+
 not lvconvert --yes --type snapshot $vg/cow $vg/pool_tdata 2>&1 | tee err
 grep "lv_is_visible" err
 
@@ -53,13 +57,16 @@ grep "lv_is_visible" err
 
 # Cannot use thin-pool, _tdata, _tmeta as origin
 not lvconvert --yes --type snapshot $vg/pool $vg/cow 2>&1 | tee err
-grep "invalid" err
+grep "not supported" err
+
+not lvconvert --yes --type snapshot $vg/$LVM2_LV_NAME $vg/cow 2>&1 | tee err
+grep "not supported" err
 
 not lvconvert --yes --type snapshot $vg/pool_tdata $vg/cow 2>&1 | tee err
-grep "invalid" err
+grep "not supported" err
 
 not lvconvert --yes --type snapshot $vg/pool_tmeta $vg/cow 2>&1 | tee err
-grep "invalid" err
+grep "not supported" err
 
 lvconvert --yes -s $vg/th $vg/cow