diff --git a/.gitignore b/.gitignore
index fb7ce30735..8fe9cfaad2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,8 @@ sst_dump
 blob_dump
 block_cache_trace_analyzer
 tools/block_cache_analyzer/*.pyc
+build_tools/*.pyc
+build_tools/pycache/
 column_aware_encoding_exp
 util/build_version.cc
 build_tools/VALGRIND_LOGS/
diff --git a/Makefile b/Makefile
index 18fe9e1d07..89f5b4b06c 100644
--- a/Makefile
+++ b/Makefile
@@ -959,6 +959,7 @@ OUTPUT_DIR ?= /tmp
 .PHONY: check_0 check_1
 check_0: $(TESTS)
 	$(AM_V_GEN)./build_tools/gtest-parallel --output_dir=$(OUTPUT_DIR) --workers=$(J) --non_gtest_tests $(NON_PARALLEL_TESTS_LIST) $(PARALLEL_TESTS_LIST)
+	find ./build_tools | grep -E "(pycache|__pycache__|\.pyc$$)" | xargs rm -rf
 
 check_1: $(TESTS)
 	$(AM_V_GEN)for t in $(TESTS); do                          \
@@ -970,6 +971,7 @@ valgrind-exclude-regexp = InlineSkipTest.ConcurrentInsert|TransactionStressTest.
 .PHONY: valgrind_check_0 valgrind_check_1
 valgrind_check_0: $(TESTS)
 	$(AM_V_GEN) $(VALGRIND_VER) $(VALGRIND_OPTS) ./build_tools/gtest-parallel --output_dir=$(OUTPUT_DIR) --workers=$(J) --non_gtest_tests $(NON_PARALLEL_TESTS_LIST) $(PARALLEL_TESTS_LIST) 
+	find ./build_tools | grep -E "(pycache|__pycache__|\.pyc$$)" | xargs rm -rf
 
 valgrind_check_1: $(TESTS)
 	$(AM_V_GEN)for t in $(filter-out %skiplist_test options_settable_test,$(TESTS)); do \