diff --git a/test/test-functions b/test/test-functions
index cd1bfeb2fde..0e3c2734e2f 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -1899,6 +1899,9 @@ test_setup() {
 }
 
 test_run() {
+    mount_initdir
+    rm -f "$initdir"/{testok,failed,skipped}
+
     if [ -z "$TEST_NO_QEMU" ]; then
         if run_qemu "$1"; then
             check_result_qemu || return 1
diff --git a/test/units/testsuite-01.service b/test/units/testsuite-01.service
index 8112a85c186..85b9cf5a969 100644
--- a/test/units/testsuite-01.service
+++ b/test/units/testsuite-01.service
@@ -3,5 +3,6 @@ Description=TEST-01-BASIC
 After=multi-user.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=sh -e -x -c 'systemctl --state=failed --no-legend --no-pager >/failed ; systemctl daemon-reload ; echo OK >/testok'
 Type=oneshot
diff --git a/test/units/testsuite-02.service b/test/units/testsuite-02.service
index ddb47293220..701610b790b 100644
--- a/test/units/testsuite-02.service
+++ b/test/units/testsuite-02.service
@@ -3,5 +3,6 @@ Description=TEST-02-CRYPTSETUP
 After=multi-user.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=sh -x -c 'systemctl --state=failed --no-legend --no-pager >/failed ; echo OK > /testok'
 Type=oneshot
diff --git a/test/units/testsuite-03.service b/test/units/testsuite-03.service
index f487d41f822..fe18fdc7d7c 100644
--- a/test/units/testsuite-03.service
+++ b/test/units/testsuite-03.service
@@ -3,5 +3,6 @@ Description=TEST-03-JOBS
 After=multi-user.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-04.service b/test/units/testsuite-04.service
index 468acfa43e8..3d2b4a8bc2b 100644
--- a/test/units/testsuite-04.service
+++ b/test/units/testsuite-04.service
@@ -2,5 +2,6 @@
 Description=TEST-04-JOURNAL
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-05.service b/test/units/testsuite-05.service
index 44108d77013..66356fd16f2 100644
--- a/test/units/testsuite-05.service
+++ b/test/units/testsuite-05.service
@@ -2,5 +2,6 @@
 Description=TEST-05-RLIMITS
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-06.service b/test/units/testsuite-06.service
index 72c0a2ca0d0..3f8dad36dc7 100644
--- a/test/units/testsuite-06.service
+++ b/test/units/testsuite-06.service
@@ -5,5 +5,6 @@ Requires=load-systemd-test-module.service
 After=load-systemd-test-module.service
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-07.service b/test/units/testsuite-07.service
index 5521632a061..2506c211c2b 100644
--- a/test/units/testsuite-07.service
+++ b/test/units/testsuite-07.service
@@ -2,5 +2,6 @@
 Description=TEST-07-ISSUE-1981
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-08.service b/test/units/testsuite-08.service
index 79fb089c704..d961dc7ae29 100644
--- a/test/units/testsuite-08.service
+++ b/test/units/testsuite-08.service
@@ -2,5 +2,6 @@
 Description=TEST-08-ISSUE-2730
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=sh -x -c 'mount -o remount,rw /dev/sda1 && echo OK >/testok; systemctl poweroff'
 Type=oneshot
diff --git a/test/units/testsuite-09.service b/test/units/testsuite-09.service
index d551501335c..fc59e808893 100644
--- a/test/units/testsuite-09.service
+++ b/test/units/testsuite-09.service
@@ -2,6 +2,7 @@
 Description=TEST-09-ISSUE-2691
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=sh -c '>/testok'
 ExecStop=sh -c 'kill -SEGV $$$$'
 Type=oneshot
diff --git a/test/units/testsuite-10.service b/test/units/testsuite-10.service
index 13756cfa512..24f0da35abd 100644
--- a/test/units/testsuite-10.service
+++ b/test/units/testsuite-10.service
@@ -2,5 +2,6 @@
 Description=TEST-10-ISSUE-2467
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 Type=oneshot
 ExecStart=sh -e -x -c 'rm -f /tmp/nonexistent; systemctl start test10.socket; printf x >test.file; socat -t20 OPEN:test.file UNIX-CONNECT:/run/test.ctl; >/testok'
diff --git a/test/units/testsuite-11.service b/test/units/testsuite-11.service
index 9093ae8d434..1544fd68198 100644
--- a/test/units/testsuite-11.service
+++ b/test/units/testsuite-11.service
@@ -2,5 +2,6 @@
 Description=TEST-11-ISSUE-3166
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-12.service b/test/units/testsuite-12.service
index 77153ea2eb3..72894eff929 100644
--- a/test/units/testsuite-12.service
+++ b/test/units/testsuite-12.service
@@ -3,5 +3,6 @@ Description=TEST-12-ISSUE-3171
 After=multi-user.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-13.service b/test/units/testsuite-13.service
index a7441d12799..5086793a90a 100644
--- a/test/units/testsuite-13.service
+++ b/test/units/testsuite-13.service
@@ -2,5 +2,6 @@
 Description=TEST-13-NSPAWN-SMOKE
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-14.service b/test/units/testsuite-14.service
index 1fc0da6409d..1606c68fb16 100644
--- a/test/units/testsuite-14.service
+++ b/test/units/testsuite-14.service
@@ -2,6 +2,7 @@
 Description=TEST-14-MACHINE-ID
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 ExecStart=/bin/sh -e -x -c 'systemctl --state=failed --no-legend --no-pager >/failed ; echo OK >/testok'
 Type=oneshot
diff --git a/test/units/testsuite-15.service b/test/units/testsuite-15.service
index 2d07bd69438..09571ed1abd 100644
--- a/test/units/testsuite-15.service
+++ b/test/units/testsuite-15.service
@@ -2,5 +2,6 @@
 Description=TEST-15-DROPIN
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-16.service b/test/units/testsuite-16.service
index 1ebf3d3af67..b44baad91a6 100644
--- a/test/units/testsuite-16.service
+++ b/test/units/testsuite-16.service
@@ -12,6 +12,7 @@ Wants=fail-runtime.service
 StopWhenUnneeded=yes
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 Type=simple
 TimeoutStartSec=infinity
 ExecStartPre=/usr/lib/systemd/tests/testdata/units/%N.sh
diff --git a/test/units/testsuite-17.service b/test/units/testsuite-17.service
index 2002543a339..ed2017a8486 100644
--- a/test/units/testsuite-17.service
+++ b/test/units/testsuite-17.service
@@ -2,5 +2,6 @@
 Description=TEST-17-UDEV-WANTS
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-18.service b/test/units/testsuite-18.service
index 08e836671ee..e4a945dc3ed 100644
--- a/test/units/testsuite-18.service
+++ b/test/units/testsuite-18.service
@@ -2,5 +2,6 @@
 Description=TEST-18-FAILUREACTION
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-19.service b/test/units/testsuite-19.service
index 13a0b612cb1..d6ad5bededa 100644
--- a/test/units/testsuite-19.service
+++ b/test/units/testsuite-19.service
@@ -2,5 +2,6 @@
 Description=TEST-19-DELEGATE
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-20.service b/test/units/testsuite-20.service
index 9befd812837..d31d5311756 100644
--- a/test/units/testsuite-20.service
+++ b/test/units/testsuite-20.service
@@ -4,6 +4,7 @@ Before=getty-pre.target
 Wants=getty-pre.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
 NotifyAccess=all
diff --git a/test/units/testsuite-22.service b/test/units/testsuite-22.service
index 3d53cbf56ce..55e3056d53c 100644
--- a/test/units/testsuite-22.service
+++ b/test/units/testsuite-22.service
@@ -5,6 +5,7 @@ Before=getty-pre.target
 Wants=getty-pre.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
 StandardOutput=tty
diff --git a/test/units/testsuite-23.service b/test/units/testsuite-23.service
index c221bd28cc9..b3b3297af8c 100644
--- a/test/units/testsuite-23.service
+++ b/test/units/testsuite-23.service
@@ -2,5 +2,6 @@
 Description=TEST-23-TYPE-EXEC
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-24.service b/test/units/testsuite-24.service
index de53f03fb40..43d4816d485 100644
--- a/test/units/testsuite-24.service
+++ b/test/units/testsuite-24.service
@@ -2,5 +2,6 @@
 Description=TEST-24-UNIT-TESTS
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-24.sh b/test/units/testsuite-24.sh
index 0e3cb154777..1ff1c3347b2 100755
--- a/test/units/testsuite-24.sh
+++ b/test/units/testsuite-24.sh
@@ -6,6 +6,9 @@ NPROC=$(nproc)
 MAX_QUEUE_SIZE=${NPROC:-2}
 IFS=$'\n' TEST_LIST=($(ls /usr/lib/systemd/tests/test-*))
 
+# reset state
+rm /failed-tests /skipped-tests /skipped
+
 # Check & report test results
 # Arguments:
 #   $1: test path
diff --git a/test/units/testsuite-25.service b/test/units/testsuite-25.service
index 39b43917d0a..45d8b6945f4 100644
--- a/test/units/testsuite-25.service
+++ b/test/units/testsuite-25.service
@@ -2,5 +2,6 @@
 Description=TEST-25-IMPORT
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-26.service b/test/units/testsuite-26.service
index ac1b2faa3f9..65b66835ed3 100644
--- a/test/units/testsuite-26.service
+++ b/test/units/testsuite-26.service
@@ -2,5 +2,6 @@
 Description=TEST-26-SETENV
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-27.service b/test/units/testsuite-27.service
index a1e88510886..52185f05725 100644
--- a/test/units/testsuite-27.service
+++ b/test/units/testsuite-27.service
@@ -2,5 +2,6 @@
 Description=TEST-27-STDOUTFILE
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-28.service b/test/units/testsuite-28.service
index c4be0c631c1..6a411144931 100644
--- a/test/units/testsuite-28.service
+++ b/test/units/testsuite-28.service
@@ -5,5 +5,6 @@ Wants=specifier-j-wants.service
 After=specifier-j-wants.service
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=true
 Type=oneshot
diff --git a/test/units/testsuite-29.service b/test/units/testsuite-29.service
index 87e46bd5873..90c2187bd79 100644
--- a/test/units/testsuite-29.service
+++ b/test/units/testsuite-29.service
@@ -2,5 +2,6 @@
 Description=TEST-29-UDEV-ID_RENAMING
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-30.service b/test/units/testsuite-30.service
index c3bb25853da..eb342f3d17e 100644
--- a/test/units/testsuite-30.service
+++ b/test/units/testsuite-30.service
@@ -2,5 +2,6 @@
 Description=TEST-30-ONCLOCKCHANGE
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-31.service b/test/units/testsuite-31.service
index 26ec2cb5cda..07dfb0bb542 100644
--- a/test/units/testsuite-31.service
+++ b/test/units/testsuite-31.service
@@ -2,5 +2,6 @@
 Description=TEST-31-DEVICE-ENUMERATION
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-32.service b/test/units/testsuite-32.service
index a868b46abf1..aab95cb7419 100644
--- a/test/units/testsuite-32.service
+++ b/test/units/testsuite-32.service
@@ -2,6 +2,7 @@
 Description=TEST-32-OOMPOLICY
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
 MemoryAccounting=yes
diff --git a/test/units/testsuite-33.service b/test/units/testsuite-33.service
index 8b65c8b1063..b64f1e0b79e 100644
--- a/test/units/testsuite-33.service
+++ b/test/units/testsuite-33.service
@@ -2,5 +2,6 @@
 Description=TEST-33-CLEAN-UNIT
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-34.service b/test/units/testsuite-34.service
index d7051d450c7..361e328221c 100644
--- a/test/units/testsuite-34.service
+++ b/test/units/testsuite-34.service
@@ -2,5 +2,6 @@
 Description=TEST-34-DYNAMICUSERMIGRATE
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-36.service b/test/units/testsuite-36.service
index f2dcbead69f..a681153ee45 100644
--- a/test/units/testsuite-36.service
+++ b/test/units/testsuite-36.service
@@ -2,5 +2,6 @@
 Description=TEST-36-NUMAPOLICY
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-37.service b/test/units/testsuite-37.service
index 68c805985d1..d25c6d2cf9b 100644
--- a/test/units/testsuite-37.service
+++ b/test/units/testsuite-37.service
@@ -2,5 +2,6 @@
 Description=TEST-37-RUNTIMEDIRECTORYPRESERVE
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-39.service b/test/units/testsuite-39.service
index dbd924c6aa2..395fe803e77 100644
--- a/test/units/testsuite-39.service
+++ b/test/units/testsuite-39.service
@@ -2,5 +2,6 @@
 Description=TEST-39-EXECRELOAD
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-40.service b/test/units/testsuite-40.service
index 51659cce5d8..38b0bd80d13 100644
--- a/test/units/testsuite-40.service
+++ b/test/units/testsuite-40.service
@@ -2,5 +2,6 @@
 Description=TEST-40-EXEC-COMMAND-EX
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-41.service b/test/units/testsuite-41.service
index bf0b0db6a2f..766cb4c99af 100644
--- a/test/units/testsuite-41.service
+++ b/test/units/testsuite-41.service
@@ -2,5 +2,6 @@
 Description=TEST-41-ONESHOT-RESTART
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-42.service b/test/units/testsuite-42.service
index d5d102fd916..a5504b515d7 100644
--- a/test/units/testsuite-42.service
+++ b/test/units/testsuite-42.service
@@ -4,5 +4,6 @@ Before=getty-pre.target
 Wants=getty-pre.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-43.service b/test/units/testsuite-43.service
index 6badedcc719..31248f17e8a 100644
--- a/test/units/testsuite-43.service
+++ b/test/units/testsuite-43.service
@@ -4,5 +4,6 @@ After=systemd-logind.service user@4711.service
 Wants=user@4711.service
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
diff --git a/test/units/testsuite-44.service b/test/units/testsuite-44.service
index 1211ea3eab0..bd4dd728aa6 100644
--- a/test/units/testsuite-44.service
+++ b/test/units/testsuite-44.service
@@ -6,6 +6,7 @@ Wants=systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket
 After=systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
 LogTarget=foobar
diff --git a/test/units/testsuite-46.service b/test/units/testsuite-46.service
index 46e9a618e2c..da359cbb23a 100644
--- a/test/units/testsuite-46.service
+++ b/test/units/testsuite-46.service
@@ -4,6 +4,7 @@ Before=getty-pre.target
 Wants=getty-pre.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
 NotifyAccess=all
diff --git a/test/units/testsuite-47.service b/test/units/testsuite-47.service
index b6015e27cce..3816c57eed6 100644
--- a/test/units/testsuite-47.service
+++ b/test/units/testsuite-47.service
@@ -2,5 +2,6 @@
 Description=TEST-47-ISSUE-14566
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot