diff --git a/test/shell/dmstats-create.sh b/test/shell/dmstats-create.sh
index c16f26f70..03406aeff 100644
--- a/test/shell/dmstats-create.sh
+++ b/test/shell/dmstats-create.sh
@@ -11,6 +11,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 SKIP_WITH_LVMPOLLD=1
+SKIP_WITH_LVMLOCKD=1
 
 . lib/inittest
 
diff --git a/test/shell/dmstats-report.sh b/test/shell/dmstats-report.sh
index 031214901..bd72f1a61 100644
--- a/test/shell/dmstats-report.sh
+++ b/test/shell/dmstats-report.sh
@@ -11,6 +11,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 SKIP_WITH_LVMPOLLD=1
+SKIP_WITH_LVMLOCKD=1
 
 . lib/inittest
 
diff --git a/test/shell/lv-ancestry.sh b/test/shell/lv-ancestry.sh
index 732499fa5..c36f366f8 100644
--- a/test/shell/lv-ancestry.sh
+++ b/test/shell/lv-ancestry.sh
@@ -11,6 +11,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 SKIP_WITH_LVMPOLLD=1
+SKIP_WITH_LVMLOCKD=1
 
 . lib/inittest
 
diff --git a/test/shell/lvconvert-repair-cache.sh b/test/shell/lvconvert-repair-cache.sh
index 4b9d8b824..6afb7ea3b 100644
--- a/test/shell/lvconvert-repair-cache.sh
+++ b/test/shell/lvconvert-repair-cache.sh
@@ -13,6 +13,7 @@
 # Test repairing of broken cached LV
 
 SKIP_WITH_LVMPOLLD=1
+SKIP_WITH_LVMLOCKD=1
 
 . lib/inittest
 
diff --git a/test/shell/process-each-lv.sh b/test/shell/process-each-lv.sh
index e9cea8157..9482a0847 100644
--- a/test/shell/process-each-lv.sh
+++ b/test/shell/process-each-lv.sh
@@ -11,6 +11,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 test_description='Exercise toollib process_each_lv'
+
 SKIP_WITH_LVMPOLLD=1
 
 # disable lvmetad logging as it bogs down test systems
@@ -18,6 +19,7 @@ export LVM_TEST_LVMETAD_DEBUG_OPTS=${LVM_TEST_LVMETAD_DEBUG_OPTS-}
 
 . lib/inittest
 
+
 aux prepare_devs 10
 
 #
diff --git a/test/shell/pv-ext-update.sh b/test/shell/pv-ext-update.sh
index cfaece7f6..44f301e1d 100644
--- a/test/shell/pv-ext-update.sh
+++ b/test/shell/pv-ext-update.sh
@@ -12,6 +12,7 @@
 
 # lvmetad does not handle pool labels so skip test.
 SKIP_WITH_LVMPOLLD=1
+SKIP_WITH_LVMLOCKD=1
 
 . lib/inittest
 
diff --git a/test/shell/relative-sign-options.sh b/test/shell/relative-sign-options.sh
index 2db281ad4..2a36f1f8e 100644
--- a/test/shell/relative-sign-options.sh
+++ b/test/shell/relative-sign-options.sh
@@ -12,6 +12,7 @@
 
 test_description='Exercise toollib process_each_lv'
 SKIP_WITH_LVMPOLLD=1
+SKIP_WITH_LVMLOCKD=1
 
 # disable lvmetad logging as it bogs down test systems
 export LVM_TEST_LVMETAD_DEBUG_OPTS=${LVM_TEST_LVMETAD_DEBUG_OPTS-}
diff --git a/test/shell/vg-check-devs-used.sh b/test/shell/vg-check-devs-used.sh
index 7d4481204..9b99ef70a 100644
--- a/test/shell/vg-check-devs-used.sh
+++ b/test/shell/vg-check-devs-used.sh
@@ -11,6 +11,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 SKIP_WITH_LVMPOLLD=1
+SKIP_WITH_LVMLOCKD=1
 
 . lib/inittest