diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index 3ffe5b5a..0f717f7a 100644
--- a/.cci.jenkinsfile
+++ b/.cci.jenkinsfile
@@ -67,7 +67,7 @@ cosaPod(memory: "7168Mi", cpu: "4") {
       // The previous e2e leaves things only having built an ostree update
       shwrap("cosa build && cosa osbuild qemu")
       // bootupd really can't break upgrades for the OS
-      kola(cosaDir: "${env.WORKSPACE}", extraArgs: "ext.*bootupd* --qemu-firmware=uefi", skipUpgrade: true, skipBasicScenarios: true)
+      kola(cosaDir: "${env.WORKSPACE}", extraArgs: "ext.bootupd.* ext.config.boot.* --qemu-firmware=uefi", skipUpgrade: true, skipBasicScenarios: true)
     }
   } finally {
     archiveArtifacts allowEmptyArchive: true, artifacts: 'tmp/console.txt'
diff --git a/tests/kola/raid1/config.bu b/tests/kola/raid1/config.bu
deleted file mode 100644
index 373d5360..00000000
--- a/tests/kola/raid1/config.bu
+++ /dev/null
@@ -1,9 +0,0 @@
-variant: fcos
-version: 1.5.0
-boot_device:
-  # The {{LAYOUT}} will be replaced by https://github.com/coreos/coreos-assembler/pull/4525
-  layout: {{LAYOUT}}
-  mirror:
-    devices:
-      - /dev/vda
-      - /dev/vdb
diff --git a/tests/kola/raid1/data/libtest.sh b/tests/kola/raid1/data/libtest.sh
deleted file mode 120000
index 59532579..00000000
--- a/tests/kola/raid1/data/libtest.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../data/libtest.sh
\ No newline at end of file
diff --git a/tests/kola/raid1/test.sh b/tests/kola/raid1/test.sh
deleted file mode 100755
index 2a690ab3..00000000
--- a/tests/kola/raid1/test.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-## kola:
-##   # additionalDisks is only supported on qemu.
-##   platforms: qemu
-##   # Root reprovisioning requires at least 4GiB of memory.
-##   minMemory: 4096
-##   # Linear RAID is setup on these disks.
-##   additionalDisks: ["10G"]
-##   # This test includes a lot of disk I/O and needs a higher
-##   # timeout value than the default.
-##   timeoutMin: 15
-##   description: Verify updating multiple EFIs using RAID 1 works.
-
-set -xeuo pipefail
-
-# shellcheck disable=SC1091
-. "$KOLA_EXT_DATA/libtest.sh"
-
-tmpdir=$(mktemp -d)
-cd ${tmpdir}
-
-srcdev=$(findmnt -nvr /sysroot -o SOURCE)
-[[ ${srcdev} == "/dev/md126" ]]
-
-blktype=$(lsblk -o TYPE "${srcdev}" --noheadings)
-[[ ${blktype} == "raid1" ]]
-
-fstype=$(findmnt -nvr /sysroot -o FSTYPE)
-[[ ${fstype} == "xfs" ]]
-ok "source is XFS on RAID1 device"
-
-mount -o remount,rw /boot
-rm -f -v /boot/bootupd-state.json
-
-bootupctl adopt-and-update | tee out.txt
-assert_file_has_content out.txt "Adopted and updated: BIOS: .*"
-assert_file_has_content out.txt "Adopted and updated: EFI: .*"
-
-bootupctl status | tee out.txt
-assert_file_has_content_literal out.txt 'Component BIOS'
-assert_file_has_content_literal out.txt 'Component EFI'
-ok "bootupctl adopt-and-update supports multiple EFIs on RAID1"