diff --git a/Makefile b/Makefile
index 3d6d6f7686679a..c99f6c21f830ac 100644
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,7 @@ clean:
 	-rm -rf out/Makefile $(NODE_EXE) $(NODE_G_EXE) out/$(BUILDTYPE)/$(NODE_EXE)
 	@if [ -d out ]; then find out/ -name '*.o' -o -name '*.a' | xargs rm -rf; fi
 	-rm -rf node_modules
+	-rm -f test.tap
 
 distclean:
 	-rm -rf out
diff --git a/tools/test.py b/tools/test.py
index 452b99edbc4024..59a31bf1cfabe4 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -1418,7 +1418,7 @@ def Main():
   logger.addHandler(ch)
   logger.setLevel(logging.INFO)
   if options.logfile:
-    fh = logging.FileHandler(options.logfile)
+    fh = logging.FileHandler(options.logfile, mode='wb')
     logger.addHandler(fh)
 
   workspace = abspath(join(dirname(sys.argv[0]), '..'))