diff --git a/Makefile b/Makefile
index 3863926..97c6c42 100644
--- a/Makefile
+++ b/Makefile
@@ -394,14 +394,12 @@
 endef
 
 test: test-boot
-test-list: test-list-boot
 
 .PHONY: test-boot
 test-boot: $(BOOT_TESTS)
 
-.PHONY: test-list-boot
-test-list-boot:
-	@ for x in $(BOOT_TESTS); do echo $x; done
+TEST_LISTS += test-list-boot
+test-list-boot: LISTED_TESTS = $(BOOT_TESTS)
 
 .PHONY: $(BOOT_TESTS)
 $(BOOT_TESTS): $(KERNEL_IMAGE)
@@ -429,15 +427,16 @@
 endef
 
 test: test-crosvm-helloworld
-test-list: test-list-crosvm-helloworld
-
 .PHONY: test-crosvm-helloworld
 test-crosvm-helloworld: $(CROSVM_HELLOWORLD_TESTS)
 
-.PHONY: test-list-crosvm-helloworld
-test-list-crosvm-helloworld:
-	@ for x in $(CROSVM_HELLOWORLD_TESTS); do echo $x; done
+TEST_LISTS += test-list-crosvm-helloworld
+test-list-crosvm-helloworld: LISTED_TESTS = $(CROSVM_HELLOWORLD_TESTS)
 
 .PHONY: $(CROSVM_HELLOWORLD_TESTS)
 $(CROSVM_HELLOWORLD_TESTS): $(KERNEL_IMAGE) $(UBOOT_BIN)
 	@ $(call gen_crosvm_helloworld_test,$@,$(call hyphensuffix,$@))
+
+.PHONY test-list: $(TEST_LISTS)
+$(TEST_LISTS):
+	@ for x in $(LISTED_TESTS); do echo $$x; done