diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh
index db39149eb2..f39383abc5 100755
--- a/test/units/testsuite-50.sh
+++ b/test/units/testsuite-50.sh
@@ -7,13 +7,17 @@ set -o pipefail
 
 export SYSTEMD_LOG_LEVEL=debug
 
-cleanup()
-{
+cleanup() {(
+    set +ex
+
     if [ -z "${image_dir}" ]; then
         return
     fi
+    umount "${image_dir}/app0"
+    umount "${image_dir}/app1"
+    umount "${image_dir}/app-nodistro"
     rm -rf "${image_dir}"
-}
+)}
 
 udevadm control --log-level=debug
 
@@ -297,7 +301,14 @@ Type=notify
 RemainAfterExit=yes
 MountAPIVFS=yes
 PrivateTmp=yes
-ExecStart=/bin/sh -c 'systemd-notify --ready; while ! grep -q -F MARKER /tmp/img/usr/lib/os-release; do sleep 0.1; done; mount | grep -e "/dev/mapper/${roothash}-verity" -e "/dev/mapper/loop[0-9]*-verity" | grep -q -F "nosuid"'
+ExecStart=/bin/sh -c ' \\
+    systemd-notify --ready; \\
+    while [[ ! -f /tmp/img/usr/lib/os-release ]] || ! grep -q -F MARKER /tmp/img/usr/lib/os-release; do \\
+        sleep 0.1; \\
+    done; \\
+    mount; \\
+    mount | grep -F "on /tmp/img type squashfs" | grep -q -F "nosuid"; \\
+'
 EOF
 systemctl start testservice-50d.service