diff --git a/configure.ac b/configure.ac
index dde2cdeea7..d8be160ad9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2254,6 +2254,7 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \
           tests/xmconfigdata/Makefile \
           tests/xencapsdata/Makefile \
           tests/confdata/Makefile \
+          tests/commanddata/Makefile \
           examples/apparmor/Makefile \
           examples/domain-events/events-c/Makefile \
           examples/domsuspend/Makefile \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e5c8d36b5c..0a235cfcce 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,7 @@
 
 SHELL = $(PREFERABLY_POSIX_SHELL)
 
-SUBDIRS = confdata sexpr2xmldata \
+SUBDIRS = commanddata confdata sexpr2xmldata \
   xml2sexprdata xmconfigdata xencapsdata
 
 INCLUDES = \
diff --git a/tests/commanddata/Makefile.am b/tests/commanddata/Makefile.am
new file mode 100644
index 0000000000..ea0f8e11fe
--- /dev/null
+++ b/tests/commanddata/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = \
+   $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.log))
diff --git a/tests/commandtest.c b/tests/commandtest.c
index e95620500b..a1bcf688e3 100644
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -86,7 +86,7 @@ static int checkoutput(const char *testname)
     ret = 0;
 
 cleanup:
-    unlink(actuallog);
+    unlink(actualname);
     VIR_FREE(actuallog);
     VIR_FREE(actualname);
     VIR_FREE(expectlog);
@@ -248,6 +248,7 @@ static int test4(const void *unused ATTRIBUTE_UNUSED)
 
 cleanup:
     virCommandFree(cmd);
+    unlink(pidfile);
     VIR_FREE(pidfile);
     return ret;
 }
@@ -707,12 +708,6 @@ mymain(int argc, char **argv)
                     1, NAME, NULL) < 0)                               \
         ret = -1
 
-    char *actualname;
-    if (virAsprintf(&actualname, "%s/commandhelper.log", abs_builddir) < 0)
-        return EXIT_FAILURE;
-    unlink(actualname);
-    VIR_FREE(actualname);
-
     DO_TEST(test0);
     DO_TEST(test1);
     DO_TEST(test2);