diff --git a/test/bootc.install b/test/bootc.install
new file mode 100644
index 000000000000..ef65a3ec1e56
--- /dev/null
+++ b/test/bootc.install
@@ -0,0 +1,25 @@
+#!/bin/sh
+set -eux
+
+cd /var/tmp/
+
+# bootc images have their own deployed image in a local registry
+podman run -d --rm --name ostree-registry -p 5000:5000 -v /var/lib/cockpit-test-registry/:/var/lib/registry localhost/test-registry
+
+# build updated bootc image with our RPMs
+podman build -t localhost/bootc-test --layers=false -f - . <<EOF
+FROM localhost:5000/bootc:latest
+COPY ./rpms /tmp/rpms
+RUN rpm --upgrade --verbose /tmp/rpms/*.rpm && rm -r /tmp/rpms
+COPY ./playground /usr/share/cockpit/playground
+EOF
+
+# deploy it
+bootc switch --transport containers-storage localhost/bootc-test
+
+# clean up
+podman rm -ft0 ostree-registry
+podman rmi localhost:5000/bootc localhost/bootc-test
+
+# ensure that we don't accidentally test with container
+podman rmi quay.io/cockpit/ws:latest
diff --git a/test/image-prepare b/test/image-prepare
index c93fa0b32105..24e696648b31 100755
--- a/test/image-prepare
+++ b/test/image-prepare
@@ -165,6 +165,25 @@ def build_install_ostree(dist_tar, image, verbose, quick):
     return args
 
 
+def build_install_bootc(dist_tar, image, verbose, quick):
+    """Special treatment of build/install on Bootc
+
+    bootc image can't build packages, build them on corresponding OSes, build a new bootc
+    image with the rpms, and deploy it.
+    """
+    with create_machine(testmap.get_build_image(image)) as machine:
+        rpms = build_rpms(dist_tar, machine, verbose, quick)
+    args = ["--run-command", "mkdir -p /var/tmp/rpms"]
+    for rpm in rpms:
+        if not any(r in rpm for r in [".src", "debug", "packagekit", "storaged"]):
+            args += ["--upload", f"{rpm}:/var/tmp/rpms/"]
+    args += [
+        "--upload", os.path.join(BASE_DIR, "dist/playground") + ":/var/tmp/",
+        "--script", os.path.join(TEST_DIR, "bootc.install"),
+    ]
+    return args
+
+
 def build_install_container(dist_tar, image, verbose, quick):
     """Build VM with cockpit/ws container
 
@@ -253,6 +272,8 @@ def main():
 
     if args.image == "fedora-coreos":
         customize += build_install_ostree(dist_tar, args.image, args.verbose, args.quick)
+    if args.image.endswith("-bootc"):
+        customize += build_install_bootc(dist_tar, args.image, args.verbose, args.quick)
     elif args.container:
         customize += build_install_container(dist_tar, args.image, args.verbose, args.quick)
     else: