diff --git a/test/test-functions b/test/test-functions
index 6038b710b2..11c5da3cb1 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -3036,6 +3036,7 @@ _test_cleanup() {
         fi
         [[ -n "$TESTDIR" ]] && rm -vfr "$TESTDIR"
         [[ -n "$STATEFILE" ]] && rm -vf "$STATEFILE"
+        [[ -n "$STATEDIR" ]] && rm -vfr "$STATEDIR"
     ) || :
 }