diff --git a/libguestfs.spec b/libguestfs.spec
index 3fed6a5..b11509d 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -907,9 +907,10 @@ export SKIP_TEST_XFS_ADMIN=1
 export SKIP_TEST_XFS_MISC_PL=1
 
 # LVM/DM broken in Rawhide (RHBZ#1237136, RHBZ#1237137).
-export SKIP_TEST_VGREMOVE_0=1
-export SKIP_TEST_LVREMOVE_1=1
-export SKIP_TEST_LVREMOVE_2=1
+export SKIP_TEST_LVREMOVE=1
+export SKIP_TEST_PVREMOVE=1
+export SKIP_TEST_VGREMOVE=1
+export SKIP_TEST_VGRENAME=1
 export SKIP_TEST_LUKS_SH=1
 
 # Skip gnulib tests which fail (probably these are kernel/glibc bugs).