diff --git a/tests/commandhelper.c b/tests/commandhelper.c
index 854f3c09bf..5f0c1f5a51 100644
--- a/tests/commandhelper.c
+++ b/tests/commandhelper.c
@@ -194,7 +194,7 @@ static void printDaemonization(FILE *log, struct Arguments *args)
 
 static int printCwd(FILE *log)
 {
-    char *cwd = NULL;
+    cleanup(char *, cleanupGeneric) cwd = NULL;
     char *display;
 
     if (!(cwd = getcwd(NULL, 0)))
@@ -213,7 +213,6 @@ static int printCwd(FILE *log)
 # endif
 
     fprintf(log, "CWD:%s\n", display);
-    free(cwd);
     return 0;
 }