diff --git a/usr/lib/archboot/cpio/hooks/installer b/usr/lib/archboot/cpio/hooks/installer
index 75a821115..4adbf2527 100644
--- a/usr/lib/archboot/cpio/hooks/installer
+++ b/usr/lib/archboot/cpio/hooks/installer
@@ -6,7 +6,7 @@ _run ()
 {
     _dir /mnt/install
     _map _binary genfstab arch-chroot pacstrap \
-    archboot-{binary-check.sh,fw-check.sh,not-installed.sh,testsuite.sh} hwdetect
+    archboot-{binary-check.sh,fw-check.sh,not-installed.sh} hwdetect
     _file_rename /usr/bin/archboot-setup.sh /usr/bin/setup
     _file_rename /usr/bin/archboot-launcher.sh /usr/bin/launcher
     _file_rename /usr/bin/archboot-quickinst.sh /usr/bin/quickinst
@@ -15,6 +15,7 @@ _run ()
     _file_rename /usr/bin/archboot-copy-mountpoint.sh /usr/bin/copy-mountpoint.sh
     _file_rename /usr/bin/archboot-rsync-backup.sh /usr/bin/rsync-backup.sh
     _file_rename /usr/bin/archboot-restore-usbstick.sh /usr/bin/restore-usbstick.sh
+    _file_rename /usr/bin/archboot-testsuite.sh /usr/bin/testsuite.sh
     _full_dir /usr/lib/archboot/installer
     _file /etc/archboot/defaults
     _file /usr/share/archboot/grub/archboot-background.png
diff --git a/usr/lib/archboot/update/manage.sh b/usr/lib/archboot/update/manage.sh
index 53e55621e..6ed5e7e58 100644
--- a/usr/lib/archboot/update/manage.sh
+++ b/usr/lib/archboot/update/manage.sh
@@ -151,11 +151,11 @@ _download_latest_task() {
     ${_DLPROG} -o "${_ETC}/defaults" "${_SOURCE}${_ETC}/defaults?inline=false"
     # helper binaries
     # main binaries
-    _SCRIPTS="quickinst setup clock launcher localize network pacsetup update copy-mountpoint rsync-backup restore-usbstick"
+    _SCRIPTS="quickinst setup clock launcher localize network pacsetup update copy-mountpoint rsync-backup restore-usbstick testsuite"
     for i in ${_SCRIPTS}; do
         [[ -e "${_BIN}/${i}" ]] && ${_DLPROG} -o "${_BIN}/${i}" "${_SOURCE}${_BIN}/archboot-${i}.sh?inline=false"
     done
-    _SCRIPTS="binary-check.sh fw-check.sh not-installed.sh secureboot-keys.sh testsuite.sh mkkeys.sh hwsim.sh"
+    _SCRIPTS="binary-check.sh fw-check.sh not-installed.sh secureboot-keys.sh mkkeys.sh hwsim.sh"
     for i in ${_SCRIPTS}; do
         [[ -e "${_BIN}/${i}" ]] && ${_DLPROG} -o "${_BIN}/${i}" "${_SOURCE}${_BIN}/archboot-${i}?inline=false"
         [[ -e "${_BIN}/archboot-${i}" ]] && ${_DLPROG} -o "${_BIN}/archboot-${i}" "${_SOURCE}${_BIN}/archboot-${i}?inline=false"