diff --git a/test/test-functions b/test/test-functions
index 5a16459aeb8..1a4e42f575d 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -3040,7 +3040,6 @@ _test_cleanup() {
         fi
         [[ -n "$TESTDIR" ]] && rm -vfr "$TESTDIR"
         [[ -n "$STATEFILE" ]] && rm -vf "$STATEFILE"
-        [[ -n "$STATEDIR" ]] && rm -vfr "$STATEDIR"
     ) || :
 }
 
@@ -3255,7 +3254,8 @@ do_test() {
                 fi
                 test_cleanup
                 if [ $ret -eq 0 ]; then
-                    rm "$TESTLOG"
+                    # $TESTLOG is in $STATEDIR, so clean it up only on success
+                    [[ -n "$STATEDIR" ]] && rm -vfr "$STATEDIR"
                     echo "[OK]"
                 else
                     echo "[FAILED]"