diff --git a/Makefile.in b/Makefile.in
index e1178ee98..ce619575a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -91,7 +91,7 @@ all: cscope.out
 endif
 DISTCLEAN_TARGETS += cscope.out
 
-check check_full check_cluster check_local check_lvmetad unit: all
+check check_system check_cluster check_local check_lvmetad unit: all
 	$(MAKE) -C test $(@)
 
 install_system_dirs:
diff --git a/test/Makefile.in b/test/Makefile.in
index 96c4fdb99..5c9f5d54c 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -90,19 +90,14 @@ check: .tests-stamp
 		      $(patsubst %,cluster:%,$(RUN_BASE)) \
 		      $(patsubst %,lvmetad:%,$(LVMETAD_RUN_BASE))
 
-check_full: .tests-stamp
+check_system: .tests-stamp
 	VERBOSE=$(VERBOSE) \
-	cluster_LVM_TEST_LOCKING=3 \
 	scluster_LVM_TEST_LOCKING=3 \
-	lvmetad_LVM_TEST_LVMETAD=1 \
 	slvmetad_LVM_TEST_LVMETAD=1 \
 	snormal_LVM_TEST_DEVDIR=/dev \
 	scluster_LVM_TEST_DEVDIR=/dev \
 	slvmetad_LVM_TEST_DEVDIR=/dev \
-	./lib/harness $(patsubst %,normal:%,$(RUN_BASE)) \
-		      $(patsubst %,cluster:%,$(RUN_BASE)) \
-		      $(patsubst %,lvmetad:%,$(LVMETAD_RUN_BASE)) \
-		      $(patsubst %,snormal:%,$(RUN_BASE)) \
+	./lib/harness $(patsubst %,snormal:%,$(RUN_BASE)) \
 		      $(patsubst %,scluster:%,$(RUN_BASE)) \
 		      $(patsubst %,slvmetad:%,$(LVMETAD_RUN_BASE))