diff --git a/test/Makefile.in b/test/Makefile.in
index f6345a54c..2b115b478 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -95,6 +95,7 @@ help:
 	@echo "  check_lvmlockd_sanlock Run tests with lvmlockd and sanlock."
 	@echo "  check_lvmlockd_dlm     Run tests with lvmlockd and dlm."
 	@echo "  check_lvmlockd_test    Run tests with lvmlockd --test."
+	@echo "  check_lvmlockd_test_lvmetad Run tests with lvmlockd --test and lvmetad."
 	@echo "  run-unit-test          Run only unit tests (root not needed)."
 	@echo "  clean			Clean dir."
 	@echo "  help			Display callable targets."
@@ -203,6 +204,13 @@ check_lvmlockd_test: .tests-stamp
 		--flavours udev-lvmlockd-test --only $(T) --skip $(S)
 endif
 
+ifeq ("@BUILD_LVMLOCKD@", "yes")
+check_lvmlockd_test_lvmetad: .tests-stamp
+	VERBOSE=$(VERBOSE) ./lib/runner \
+		--testdir . --outdir results \
+		--flavours udev-lvmlockd-test-lvmetad --only $(T) --skip $(S)
+endif
+
 run-unit-test unit-test:
 	$(MAKE) -C unit $(@)
 
@@ -224,6 +232,7 @@ LIB_FLAVOURS = \
  flavour-udev-lvmlockd-sanlock\
  flavour-udev-lvmlockd-dlm\
  flavour-udev-lvmlockd-test\
+ flavour-udev-lvmlockd-test-lvmetad\
  flavour-udev-vanilla
 
 LIB_LVMLOCKD_CONF = \
diff --git a/test/lib/flavour-udev-lvmlockd-dlm.sh b/test/lib/flavour-udev-lvmlockd-dlm.sh
index 5bd274911..198ec563b 100644
--- a/test/lib/flavour-udev-lvmlockd-dlm.sh
+++ b/test/lib/flavour-udev-lvmlockd-dlm.sh
@@ -1,5 +1,4 @@
 export LVM_TEST_LOCKING=1
-export LVM_TEST_LVMETAD=1
 export LVM_TEST_LVMPOLLD=1
 export LVM_TEST_LVMLOCKD=1
 export LVM_TEST_LOCK_TYPE_DLM=1
diff --git a/test/lib/flavour-udev-lvmlockd-sanlock.sh b/test/lib/flavour-udev-lvmlockd-sanlock.sh
index 859ee2e66..52f3cea32 100644
--- a/test/lib/flavour-udev-lvmlockd-sanlock.sh
+++ b/test/lib/flavour-udev-lvmlockd-sanlock.sh
@@ -1,5 +1,4 @@
 export LVM_TEST_LOCKING=1
-export LVM_TEST_LVMETAD=1
 export LVM_TEST_LVMPOLLD=1
 export LVM_TEST_LVMLOCKD=1
 export LVM_TEST_LOCK_TYPE_SANLOCK=1
diff --git a/test/lib/flavour-udev-lvmlockd-test.sh b/test/lib/flavour-udev-lvmlockd-test.sh
index d2a7b4af1..f9cd5271c 100644
--- a/test/lib/flavour-udev-lvmlockd-test.sh
+++ b/test/lib/flavour-udev-lvmlockd-test.sh
@@ -1,5 +1,4 @@
 export LVM_TEST_LOCKING=1
-export LVM_TEST_LVMETAD=1
 export LVM_TEST_LVMPOLLD=1
 export LVM_TEST_LVMLOCKD=1
 export LVM_TEST_LVMLOCKD_TEST=1