diff --git a/scripts/test-qemu b/scripts/test-qemu
index 949c9e7..7cdb180 100755
--- a/scripts/test-qemu
+++ b/scripts/test-qemu
@@ -3,38 +3,20 @@
 set -eu
 set -x
 
-# AST2400
-PALMETTO_MTD_URL='https://jenkins.openbmc.org/job/ci-openbmc/distro=ubuntu,label=docker-builder,target=palmetto/lastStableBuild/artifact/openbmc/build/tmp/deploy/images/palmetto/obmc-phosphor-image-palmetto.static.mtd'
-PALMETTO_MTD="$(basename "$PALMETTO_MTD_URL")"
+ARTIFACT_DIR=$(mktemp -d)
 
-# AST2500
-WITHERSPOON_MTD_URL='https://jenkins.openbmc.org/job/ci-openbmc/distro=ubuntu,label=docker-builder,target=witherspoon/lastStableBuild/artifact/openbmc/build/tmp/deploy/images/witherspoon/obmc-phosphor-image-witherspoon.ubi.mtd'
-WITHERSPOON_MTD="$(basename "$WITHERSPOON_MTD_URL")"
+trap 'rm -rf ${ARTIFACT_DIR}' EXIT
 
-# AST2600
-TACOMA_WIC_XZ_URL='https://jenkins.openbmc.org/job/ci-openbmc/distro=ubuntu,label=docker-builder,target=witherspoon-tacoma/lastStableBuild/artifact/openbmc/build/tmp/deploy/images/witherspoon-tacoma/obmc-phosphor-image-witherspoon-tacoma.wic.xz'
-TACOMA_WIC_XZ="$(basename "$TACOMA_WIC_XZ_URL")"
-TACOMA_MMC="$(basename "$TACOMA_WIC_XZ_URL" .xz)"
-
-TACOMA_FITIMAGE_URL='https://jenkins.openbmc.org/job/ci-openbmc/distro=ubuntu,label=docker-builder,target=witherspoon-tacoma/lastStableBuild/artifact/openbmc/build/tmp/deploy/images/witherspoon-tacoma/fitImage-obmc-phosphor-initramfs-witherspoon-tacoma-witherspoon-tacoma'
-TACOMA_FITIMAGE="$(basename "$TACOMA_FITIMAGE_URL")"
-
-TACOMA_KERNEL=$(mktemp --suffix .kernel)
-TACOMA_DTB=$(mktemp --suffix .dtb)
-TACOMA_INITRD=$(mktemp --suffix .initrd)
-
-cleanup() {
-    rm -f "$PALMETTO_MTD"
-    rm -f "$WITHERSPOON_MTD"
-    rm -f "$TACOMA_WIC_XZ" "$TACOMA_MMC"
-    rm -f "$TACOMA_FITIMAGE"
-    rm -f "$TACOMA_KERNEL" "$TACOMA_DTB $TACOMA_INITRD"
+acquire() {
+    local target="$1"
+    wget --quiet --show-progress --directory-prefix="${ARTIFACT_DIR}" https://jenkins.openbmc.org/view/latest/job/latest-master/lastSuccessfulBuild/label=docker-builder,target="${target}"/artifact/openbmc/build/tmp/deploy/images/"${target}"/'*zip*'/"${target}".zip
+    unzip -qq -d "${ARTIFACT_DIR}" "${ARTIFACT_DIR}"/"${target}".zip
+    echo "${ARTIFACT_DIR}"/"${target}"
 }
 
-trap cleanup EXIT 2
-
 # AST2400
-wget "$PALMETTO_MTD_URL"
+PALMETTO_ARTIFACTS="$(acquire palmetto)"
+PALMETTO_MTD="$(echo "${PALMETTO_ARTIFACTS}"/obmc-phosphor-image-palmetto-*.static.mtd)"
 # shellcheck disable=SC2016 # 'expect' strings
 expect \
     -c "spawn qemu-system-arm \
@@ -49,7 +31,8 @@
     -c 'expect -i $spawn_id eof'
 
 # AST2500
-wget "$WITHERSPOON_MTD_URL"
+WITHERSPOON_ARTIFACTS="$(acquire witherspoon)"
+WITHERSPOON_MTD="$(echo "${WITHERSPOON_ARTIFACTS}"/obmc-phosphor-image-witherspoon-*.ubi.mtd)"
 # shellcheck disable=SC2016 # 'expect' strings
 expect \
     -c "spawn qemu-system-arm \
@@ -64,26 +47,28 @@
     -c 'expect -i $spawn_id eof'
 
 # AST2600
-wget "$TACOMA_WIC_XZ_URL"
-unxz "$TACOMA_WIC_XZ"
-truncate -s 16G "$TACOMA_MMC"
+P10BMC_ARTIFACTS="$(acquire p10bmc)"
 
-wget "$TACOMA_FITIMAGE_URL"
-dumpimage -T flat_dt -p 0 -o "$TACOMA_KERNEL" "$TACOMA_FITIMAGE"
-dumpimage -T flat_dt -p 1 -o "$TACOMA_DTB" "$TACOMA_FITIMAGE"
-dumpimage -T flat_dt -p 2 -o "$TACOMA_INITRD" "$TACOMA_FITIMAGE"
+P10BMC_WIC_XZ="$(echo "${P10BMC_ARTIFACTS}"/obmc-phosphor-image-p10bmc-*.wic.xz)"
+P10BMC_MMC="${P10BMC_WIC_XZ%.xz}"
+P10BMC_UBOOT_SPL="$(echo "${P10BMC_ARTIFACTS}"/u-boot-spl.bin-*)"
+P10BMC_UBOOT="$(echo "${P10BMC_ARTIFACTS}"/u-boot-p10bmc-*.bin)"
+
+dd of="$P10BMC_MMC" if=/dev/zero bs=1M count=2
+dd of="$P10BMC_MMC" if="$P10BMC_UBOOT_SPL" conv=notrunc
+dd of="$P10BMC_MMC" if="$P10BMC_UBOOT" conv=notrunc bs=1K seek=64
+
+xz --decompress --stdout --keep "$P10BMC_WIC_XZ" | dd of="$P10BMC_MMC" conv=notrunc bs=1M seek=2
+
+truncate -s 16G "$P10BMC_MMC"
 
 # shellcheck disable=SC2016 # 'expect' strings
 expect \
-    -c "spawn qemu-system-arm -M tacoma-bmc \
-            -kernel $TACOMA_KERNEL \
-            -dtb $TACOMA_DTB \
-            -initrd $TACOMA_INITRD \
-            -drive file=${TACOMA_MMC},if=sd,format=raw,index=2 \
+    -c "spawn qemu-system-arm -M rainier-bmc \
+            -drive file=${P10BMC_MMC},if=sd,format=raw,index=2 \
             -net nic \
             -net user,hostfwd=:127.0.0.1:2222-:22,hostfwd=:127.0.0.1:2443-:443,hostname=qemu \
-            -nographic \
-            -append \"console=ttyS4,115200n8 rootwait root=PARTLABEL=rofs-a\"" \
+            -nographic" \
     -c 'set timeout 300' \
     -c 'expect timeout { exit 1 } "login:"' \
     -c 'spawn sshpass -p 0penBmc ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p2222 root@localhost journalctl -b' \