diff --git a/Makefile.in b/Makefile.in
index 383793be6f894..d6ede37c4aa7c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -368,7 +368,7 @@ endif
 
 STAGE$(1)_T_$(2)_H_$(3) := 						\
 	$$(Q)$$(call CFG_RUN_TARG,$(1),				\
-		$$(CFG_VALGRIND_COMPILE$(1)) 			\
+## 		$$(CFG_VALGRIND_COMPILE$(1)) 			\
 		$$(HBIN$(1)_H_$(3))/rustc$$(X)			\
 		--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3))			\
 		$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2))
diff --git a/configure b/configure
index da1be03dfba95..9da652762a741 100755
--- a/configure
+++ b/configure
@@ -294,7 +294,7 @@ else
 fi
 
 opt sharedstd 1 "build libstd as a shared library"
-opt valgrind 1 "run tests with valgrind (memcheck by default)"
+opt valgrind 0 "run tests with valgrind (memcheck by default)"
 opt helgrind 0 "run tests with helgrind instead of memcheck"
 opt docs     1 "build documentation"
 opt optimize 1 "build optimized rust code"