diff --git a/src/common/Makefile b/src/common/Makefile
index ec7ed48ea..e00ad894d 100644
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -49,8 +49,11 @@ test: hiredis redis $(BUILD)/common_tests $(BUILD)/task_table_tests $(BUILD)/obj
 	./build/redis_tests
 	./build/task_table_tests
 	./build/object_table_tests
+	./thirdparty/redis/src/redis-cli shutdown
 
 valgrind: test
+	./thirdparty/redis/src/redis-server &
+	sleep 1s
 	valgrind --leak-check=full --error-exitcode=1 ./build/common_tests
 	valgrind --leak-check=full --error-exitcode=1 ./build/db_tests
 	valgrind --leak-check=full --error-exitcode=1 ./build/io_tests
@@ -58,5 +61,6 @@ valgrind: test
 	valgrind --leak-check=full --error-exitcode=1 ./build/redis_tests
 	valgrind --leak-check=full --error-exitcode=1 ./build/task_table_tests
 	valgrind --leak-check=full --error-exitcode=1 ./build/object_table_tests
+	./thirdparty/redis/src/redis-cli shutdown
 
 FORCE: