diff --git a/scripts/autotest_common.sh b/scripts/autotest_common.sh
index 7a4d02508..8f36e4e14 100755
--- a/scripts/autotest_common.sh
+++ b/scripts/autotest_common.sh
@@ -33,8 +33,7 @@ if [ -z "$output_dir" ]; then
 fi
 
 if hash valgrind &> /dev/null; then
-	# TODO: add --error-exitcode=2 when all Valgrind warnings are fixed
-	valgrind='valgrind --leak-check=full'
+	valgrind='valgrind --leak-check=full --error-exitcode=2'
 else
 	valgrind=''
 fi