diff --git a/.cirrus.yml b/.cirrus.yml
index 33f51a0a5024..58a57e5c61c8 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,27 +1,34 @@
 # $FreeBSD$
 
-freebsd_instance:
+compute_engine_instance:
   # Image list available via
   # gcloud compute images list --project freebsd-org-cloud-dev --no-standard-images
+  platform: freebsd
+  image_project: freebsd-org-cloud-dev
   image: freebsd-13-0-release-amd64
   cpu: 8
   memory: 24G
+  disk: 40
 
 env:
   CIRRUS_CLONE_DEPTH: 1
 
 task:
   timeout_in: 120m
   install_script:
-  - pkg install -y llvm12
+  - pkg install -y qemu uefi-edk2-qemu-x86_64 llvm12
   setup_script:
   - uname -a
   - df -m
   - pw useradd user
   - mkdir -p /usr/obj/$(pwd -P)
   - chown user:user /usr/obj/$(pwd -P)
   script:
   - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=llvm12 WITHOUT_TOOLCHAIN=yes buildworld buildkernel"
+  package_script:
+  - su user -c "make CROSS_TOOLCHAIN=llvm12 WITHOUT_TOOLCHAIN=yes PKG_FORMAT=tar packages"
+  test_script:
+  - sh tools/boot/ci-qemu-test.sh
   post_script:
   - df -m
   - du -m -s /usr/obj