diff --git a/test/units/testsuite-58.sh b/test/units/testsuite-58.sh
index 1fcc882242..21ad7d5da2 100755
--- a/test/units/testsuite-58.sh
+++ b/test/units/testsuite-58.sh
@@ -5,6 +5,7 @@ set -o pipefail
 export SYSTEMD_LOG_LEVEL=debug
 export PAGER=cat
 
+rm -f /var/tmp/testsuite-58.img /var/tmp/testsuite-58.2.img /tmp/testsuite-58.dump
 mkdir -p /tmp/testsuite-58-defs/
 
 # First part: create a disk image and verify its in order
@@ -74,8 +75,8 @@ systemd-repart --definitions=/tmp/testsuite-58-defs/ \
 
 cmp /var/tmp/testsuite-58.img /var/tmp/testsuite-58.2.img
 
-rm -f /var/tmp/testsuite-58.img /var/tmp/testsuite-58.2.img /tmp/testsuite-58.dump
-rm -rf /tmp/testsuite-58-defs/
+rm /var/tmp/testsuite-58.img /var/tmp/testsuite-58.2.img /tmp/testsuite-58.dump
+rm -r /tmp/testsuite-58-defs/
 
 echo OK >/testok