diff --git a/test/units/testsuite-02.sh b/test/units/testsuite-02.sh
index da02304a32..bf9a65972f 100755
--- a/test/units/testsuite-02.sh
+++ b/test/units/testsuite-02.sh
@@ -78,10 +78,12 @@ done
 
 # Wait for remaining running tasks
 for key in "${!running[@]}"; do
-    wait ${running[$key]}
-    ec=$?
+    wait ${running[$key]} && ec=0 || ec=$?
     report_result "$key" $ec
     unset running["$key"]
 done
 
+# Test logs are sometimes lost, as the system shuts down immediately after
+journalctl --sync
+
 exit 0