1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 48225d6c..6d0f0d47 100644
--- a/Makefile
+++ b/Makefile
@@ -31,28 +31,28 @@ test-no-interfaces: checkiso
 .PHONY: testc
 .ONESHELL:
 testc: checkiso
-	scripts/check-qemu-install --debug --configd --configtest build/live-image-amd64.hybrid.iso
+	scripts/check-qemu-install --debug --configd --configtest build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: testraid
 .ONESHELL:
 testraid: checkiso
-	scripts/check-qemu-install --debug --configd --raid --configtest build/live-image-amd64.hybrid.iso
+	scripts/check-qemu-install --debug --configd --raid --configtest build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS))
+
+.PHONY: testtpm
+.ONESHELL:
+testtpm: checkiso
+	scripts/check-qemu-install --debug --tpmtest build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: qemu-live
 .ONESHELL:
 qemu-live: checkiso
-	scripts/check-qemu-install --qemu-cmd build/live-image-amd64.hybrid.iso
+	scripts/check-qemu-install --qemu-cmd --uefi build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS))
 
-.PHONE: oci
+.PHONY: oci
 .ONESHELL:
 oci: checkiso
 	scripts/iso-to-oci build/live-image-amd64.hybrid.iso
 
-.PHONY: testtpm
-.ONESHELL:
-testtpm: checkiso
-	scripts/check-qemu-install --debug --tpmtest build/live-image-amd64.hybrid.iso
-
 .PHONY: clean
 .ONESHELL:
 clean: