diff --git a/test.mk b/test.mk
index 2d3c99f4..434ba830 100644
--- a/test.mk
+++ b/test.mk
@@ -5,19 +5,19 @@ test-clean:
 
 ovmf-x64:
 	$(MKDIR_P) ovmf-x64
-	cd ovmf-x64 && curl -o OVMF-X64.zip https://efi.akeo.ie/OVMF/OVMF-X64.zip && 7z x OVMF-X64.zip
+	cd ovmf-x64 && curl -o OVMF.fd https://retrage.github.io/edk2-nightly/bin/RELEASEX64_OVMF.fd
 
 ovmf-aa64:
-	mkdir -p ovmf-aa64
-	cd ovmf-aa64 && curl -o OVMF-AA64.zip https://efi.akeo.ie/OVMF/OVMF-AA64.zip && 7z x OVMF-AA64.zip
+	$(MKDIR_P) ovmf-aa64
+	cd ovmf-aa64 && curl -o OVMF.fd https://retrage.github.io/edk2-nightly/bin/RELEASEAARCH64_QEMU_EFI.fd
 
 ovmf-rv64:
-	mkdir -p ovmf-rv64
+	$(MKDIR_P) ovmf-rv64
 	cd ovmf-rv64 && curl -o OVMF.fd https://retrage.github.io/edk2-nightly/bin/RELEASERISCV64_VIRT.fd && dd if=/dev/zero of=OVMF.fd bs=1 count=0 seek=33554432
 
 ovmf-ia32:
 	$(MKDIR_P) ovmf-ia32
-	cd ovmf-ia32 && curl -o OVMF-IA32.zip https://efi.akeo.ie/OVMF/OVMF-IA32.zip && 7z x OVMF-IA32.zip
+	cd ovmf-ia32 && curl -o OVMF.fd https://retrage.github.io/edk2-nightly/bin/RELEASEIa32_OVMF.fd
 
 .PHONY: test.hdd
 test.hdd: