diff --git a/test/test-functions b/test/test-functions
index d60a9bfedd1..252aea57a1c 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -1940,12 +1940,12 @@ EOF
 <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
         "https://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
-    <limit name="service_start_timeout">60000</limit>
+    <limit name="service_start_timeout">120000</limit>
 </busconfig>
 EOF
         # Bump the client-side timeout in sd-bus as well
         mkdir -p "$initdir/etc/systemd/system.conf.d"
-        echo -e '[Manager]\nDefaultEnvironment=SYSTEMD_BUS_TIMEOUT=60' >"$initdir/etc/systemd/system.conf.d/bus-timeout.conf"
+        echo -e '[Manager]\nDefaultEnvironment=SYSTEMD_BUS_TIMEOUT=120' >"$initdir/etc/systemd/system.conf.d/bus-timeout.conf"
     fi
 }
 
diff --git a/test/units/testsuite-17.10.sh b/test/units/testsuite-17.10.sh
index 6978d2a1d6d..8ff214baee5 100755
--- a/test/units/testsuite-17.10.sh
+++ b/test/units/testsuite-17.10.sh
@@ -145,8 +145,8 @@ EOF
 
     udevadm test-builtin hwdb "$scsidev"
 
-    rmmod scsi_debug
-    rm -f /etc/udev/hwdb.d/99-test.hwdb
+    rmmod scsi_debug || :
+    rm -fv /etc/udev/hwdb.d/99-test.hwdb
     systemd-hwdb update
 fi
 
diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh
index 4d73c57aeb5..fbab282334e 100755
--- a/test/units/testsuite-64.sh
+++ b/test/units/testsuite-64.sh
@@ -646,7 +646,7 @@ testcase_btrfs_basic() {
     echo "Single device: default settings"
     uuid="deadbeef-dead-dead-beef-000000000000"
     label="btrfs_root"
-    udevadm lock --device="${devices[0]}" mkfs.btrfs -L "$label" -U "$uuid" "${devices[0]}"
+    udevadm lock --device="${devices[0]}" mkfs.btrfs -f -L "$label" -U "$uuid" "${devices[0]}"
     udevadm wait --settle --timeout=30 "${devices[0]}" "/dev/disk/by-uuid/$uuid" "/dev/disk/by-label/$label"
     btrfs filesystem show
     helper_check_device_symlinks
@@ -664,7 +664,7 @@ name="diskpart3", size=85M
 name="diskpart4", size=85M
 EOF
     udevadm wait --settle --timeout=30 /dev/disk/by-partlabel/diskpart{1..4}
-    udevadm lock --device="${devices[0]}" mkfs.btrfs -d single -m raid1 -L "$label" -U "$uuid" /dev/disk/by-partlabel/diskpart{1..4}
+    udevadm lock --device="${devices[0]}" mkfs.btrfs -f -d single -m raid1 -L "$label" -U "$uuid" /dev/disk/by-partlabel/diskpart{1..4}
     udevadm wait --settle --timeout=30 "/dev/disk/by-uuid/$uuid" "/dev/disk/by-label/$label"
     btrfs filesystem show
     helper_check_device_symlinks
@@ -680,7 +680,7 @@ EOF
             --device=/dev/disk/by-id/ata-foobar_deadbeefbtrfs1 \
             --device=/dev/disk/by-id/ata-foobar_deadbeefbtrfs2 \
             --device=/dev/disk/by-id/ata-foobar_deadbeefbtrfs3 \
-            mkfs.btrfs -M -d raid10 -m raid10 -L "$label" -U "$uuid" "${devices[@]}"
+            mkfs.btrfs -f -M -d raid10 -m raid10 -L "$label" -U "$uuid" "${devices[@]}"
     udevadm wait --settle --timeout=30 "/dev/disk/by-uuid/$uuid" "/dev/disk/by-label/$label"
     btrfs filesystem show
     helper_check_device_symlinks
@@ -720,7 +720,7 @@ EOF
             --device=/dev/mapper/encbtrfs1 \
             --device=/dev/mapper/encbtrfs2 \
             --device=/dev/mapper/encbtrfs3 \
-            mkfs.btrfs -M -d raid1 -m raid1 -L "$label" -U "$uuid" /dev/mapper/encbtrfs{0..3}
+            mkfs.btrfs -f -M -d raid1 -m raid1 -L "$label" -U "$uuid" /dev/mapper/encbtrfs{0..3}
     udevadm wait --settle --timeout=30 "/dev/disk/by-uuid/$uuid" "/dev/disk/by-label/$label"
     btrfs filesystem show
     helper_check_device_symlinks
diff --git a/test/units/testsuite-74.busctl.sh b/test/units/testsuite-74.busctl.sh
index 44d8032d8bc..6e905a025a2 100755
--- a/test/units/testsuite-74.busctl.sh
+++ b/test/units/testsuite-74.busctl.sh
@@ -19,7 +19,10 @@ busctl status
 busctl status --machine=.host --augment-creds=no
 busctl status --user --machine=testuser@.host
 busctl status org.freedesktop.systemd1
-busctl tree
+# Ignore the exit code here, since this runs during machine bootup, so busctl
+# might attempt to introspect a job that already finished and fail, i.e.:
+# Failed to introspect object /org/freedesktop/systemd1/job/335 of service org.freedesktop.systemd1: Unknown object '/org/freedesktop/systemd1/job/335'.
+busctl tree || :
 busctl tree org.freedesktop.login1
 busctl tree --list org.freedesktop.login1
 busctl introspect org.freedesktop.systemd1 /org/freedesktop/systemd1
diff --git a/test/units/testsuite-74.cgls.sh b/test/units/testsuite-74.cgls.sh
index 120570c9cc0..9268f42baa6 100755
--- a/test/units/testsuite-74.cgls.sh
+++ b/test/units/testsuite-74.cgls.sh
@@ -14,7 +14,8 @@ systemd-cgls --cgroup-id=no
 systemd-cgls /system.slice/systemd-journald.service
 systemd-cgls /system.slice/systemd-journald.service /init.scope
 systemd-cgls /sys/fs/cgroup/system.slice/systemd-journald.service /init.scope
-(cd /sys/fs/cgroup/init.scope && systemd-cgls)
+[[ -d /sys/fs/cgroup/init.scope ]] && init_scope="init.scope" || init_scope="systemd/init.scope"
+(cd "/sys/fs/cgroup/$init_scope" && systemd-cgls)
 systemd-cgls --unit=systemd-journald.service
 # There's most likely no user session running, so we need to create one
 systemd-run --user --wait --pipe -M testuser@.host systemd-cgls --user-unit=app.slice