diff --git a/cxx/tests/Makefile b/cxx/tests/Makefile
index df456a2cfb4..ae6bd755704 100644
--- a/cxx/tests/Makefile
+++ b/cxx/tests/Makefile
@@ -34,7 +34,7 @@ $(DBCXX):
 	cd ..;make
 
 clean:
-	rm -rf $(TARGETS) *.gcno *.gcda *.gcov *.db
+	rm -rf $(TARGETS) *.gcno *.gcda *.gcov *.db dir.test.db.assoc3 test_reverse_compare_fun.cpp.dir
 
 check_test1: test1
 	$(VGRIND) ./$< $(SUMMARIZE_CMD)
diff --git a/db-benchmark-test/Makefile b/db-benchmark-test/Makefile
index b6efc67f92d..fd8353a0ea4 100644
--- a/db-benchmark-test/Makefile
+++ b/db-benchmark-test/Makefile
@@ -14,7 +14,7 @@ SUMMARIZE_CMD =
 QUIET =
 endif
 
-BENCHDBS = bench.bdb/ bench.tokudb
+BENCHDBS = bench.bdb/ bench.tokudb ptest*.dir/ x.dir/ xfast.dir/
 
 OPTFLAGS = -O2
 CFLAGS = -Wall -Werror -g $(OPTFLAGS) $(GCOV_FLAGS) $(PROF_FLAGS)