diff --git a/python/Makefile.am b/python/Makefile.am
index ba444ef02b..767d807a2a 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -142,7 +142,8 @@ uninstall-local:
 	rm -f $(DESTDIR)$(pyexecdir)/libvirt_lxc.py
 	rm -f $(DESTDIR)$(pyexecdir)/libvirt_qemu.py
 
-CLEANFILES= $(GENERATED) $(QEMU_GENERATED) $(LXC_GENERATED) $(GENERATE).stamp
+CLEANFILES= $(GENERATED) $(QEMU_GENERATED) $(LXC_GENERATED) $(GENERATE).stamp \
+	*.pyc
 
 else
 all:
diff --git a/tests/commanddata/test21.log b/tests/commanddata/test21.log
new file mode 100644
index 0000000000..1b59206352
--- /dev/null
+++ b/tests/commanddata/test21.log
@@ -0,0 +1,12 @@
+ENV:DISPLAY=:0.0
+ENV:HOME=/home/test
+ENV:HOSTNAME=test
+ENV:LANG=C
+ENV:LOGNAME=testTMPDIR=/tmp
+ENV:PATH=/usr/bin:/bin
+ENV:USER=test
+FD:0
+FD:1
+FD:2
+DAEMON:no
+CWD:/tmp
diff --git a/tests/commandtest.c b/tests/commandtest.c
index ac369f97f7..2f01ab7fa3 100644
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -891,7 +891,7 @@ static int test21(const void *unused ATTRIBUTE_UNUSED)
         goto cleanup;
     }
 
-    ret = 0;
+    ret = checkoutput("test21");
 cleanup:
     VIR_FREE(outbuf);
     VIR_FREE(errbuf);