diff --git a/.cirrus.yml b/.cirrus.yml
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -14,7 +14,7 @@
   name: World and kernel amd64 build and boot smoke test
   timeout_in: 120m
   install_script:
-  - sh .cirrus-ci/pkg-install.sh qemu uefi-edk2-qemu-x86_64 llvm12
+  - sh .cirrus-ci/pkg-install.sh qemu llvm12
   setup_script:
   - uname -a
   - df -m
diff --git a/tools/boot/ci-qemu-test.sh b/tools/boot/ci-qemu-test.sh
--- a/tools/boot/ci-qemu-test.sh
+++ b/tools/boot/ci-qemu-test.sh
@@ -78,9 +78,8 @@
 fi
 
 # Locate the uefi firmware file used by qemu.
-: ${OVMF:=/usr/local/share/uefi-edk2-qemu/QEMU_UEFI_CODE-x86_64.fd}
+: ${OVMF:=/usr/local/share/qemu/edk2-x86_64-code.fd}
 if [ ! -r "${OVMF}" ]; then
-	echo "NOTE: UEFI firmware available in the uefi-edk2-qemu-x86_64 package" >&2
 	die "Cannot read UEFI firmware file ${OVMF}"
 fi