diff --git a/test/units/test-control.sh b/test/units/test-control.sh
index 017f6410c9..b8a57cb6ea 100644
--- a/test/units/test-control.sh
+++ b/test/units/test-control.sh
@@ -89,7 +89,12 @@ run_subtests_with_signals() {
         : "--- $subtest BEGIN ---"
         "./$subtest" &
         _CHILD_PID=$!
-        _wait_harder "$_CHILD_PID" && _PASSED_TESTS+=("$subtest") || return 1
+        if ! _wait_harder "$_CHILD_PID"; then
+            echo "Subtest $subtest failed"
+            return 1
+        fi
+
+        _PASSED_TESTS+=("$subtest")
         : "--- $subtest END ---"
     done
 
@@ -113,7 +118,12 @@ run_subtests() {
         fi
 
         : "--- $subtest BEGIN ---"
-        "./$subtest" && _PASSED_TESTS+=("$subtest") || return 1
+        if ! "./$subtest"; then
+            echo "Subtest $subtest failed"
+            return 1
+        fi
+
+        _PASSED_TESTS+=("$subtest")
         : "--- $subtest END ---"
     done
 
diff --git a/test/units/testsuite-13.machinectl.sh b/test/units/testsuite-13.machinectl.sh
index 966b11bc7f..e104a225cc 100755
--- a/test/units/testsuite-13.machinectl.sh
+++ b/test/units/testsuite-13.machinectl.sh
@@ -150,7 +150,7 @@ test ! -d /var/lib/machines/.hidden1
 
 # Prepare a simple raw container
 mkdir -p /tmp/mnt
-dd if=/dev/zero of=/tmp/container.raw bs=1M count=32
+dd if=/dev/zero of=/tmp/container.raw bs=1M count=64
 mkfs.ext4 /tmp/container.raw
 mount -o loop /tmp/container.raw /tmp/mnt
 cp -r /var/lib/machines/container1/* /tmp/mnt
diff --git a/test/units/testsuite-13.nspawn.sh b/test/units/testsuite-13.nspawn.sh
index 682f677735..9bcdec9298 100755
--- a/test/units/testsuite-13.nspawn.sh
+++ b/test/units/testsuite-13.nspawn.sh
@@ -83,7 +83,7 @@ testcase_sanity() {
     create_dummy_container "$template"
     # Create a simple image from the just created container template
     image="$(mktemp /var/lib/machines/testsuite-13.image-XXX.img)"
-    dd if=/dev/zero of="$image" bs=1M count=32
+    dd if=/dev/zero of="$image" bs=1M count=64
     mkfs.ext4 "$image"
     mkdir -p /mnt
     mount -o loop "$image" /mnt