diff --git a/autobuild.sh b/autobuild.sh
index a406b87e7..e66a64459 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -8,6 +8,8 @@ out=$PWD
 MAKEFLAGS=${MAKEFLAGS:--j16}
 DPDK_DIR=/usr/local/dpdk-2.1.0/x86_64-native-linuxapp-gcc
 
+umask 022
+
 cd $src
 
 ./scripts/check_format.sh
diff --git a/scripts/autotest_common.sh b/scripts/autotest_common.sh
index 9fcd8b3d3..0db270f67 100755
--- a/scripts/autotest_common.sh
+++ b/scripts/autotest_common.sh
@@ -7,6 +7,13 @@ else
 	output_dir=$rootdir/../output
 fi
 
+if hash valgrind &> /dev/null; then
+	# TODO: add --error-exitcode=2 when all Valgrind warnings are fixed
+	valgrind='valgrind --leak-check=full'
+else
+	valgrind=''
+fi
+
 function timing() {
 	direction="$1"
 	testname="$2"
diff --git a/test/lib/nvme/nvme.sh b/test/lib/nvme/nvme.sh
index a5a285b4e..5a0c88e45 100755
--- a/test/lib/nvme/nvme.sh
+++ b/test/lib/nvme/nvme.sh
@@ -4,11 +4,11 @@ testdir=$(readlink -f $(dirname $0))
 rootdir="$testdir/../../.."
 source $rootdir/scripts/autotest_common.sh
 
-$testdir/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut
-$testdir/unit/nvme_c/nvme_ut
-$testdir/unit/nvme_qpair_c/nvme_qpair_ut
-$testdir/unit/nvme_ctrlr_c/nvme_ctrlr_ut
-$testdir/unit/nvme_ctrlr_cmd_c/nvme_ctrlr_cmd_ut
+$valgrind $testdir/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut
+$valgrind $testdir/unit/nvme_c/nvme_ut
+$valgrind $testdir/unit/nvme_qpair_c/nvme_qpair_ut
+$valgrind $testdir/unit/nvme_ctrlr_c/nvme_ctrlr_ut
+$valgrind $testdir/unit/nvme_ctrlr_cmd_c/nvme_ctrlr_cmd_ut
 
 $testdir/aer/aer
 process_core