diff --git a/.travis.yml b/.travis.yml
index 50d5106b..8ef963ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ compiler:
 
 env:
   - CFLAGS='-Werror'
-  - CFLAGS='-Werror -m32'
-  - USE_STANDARD_TMPFILE=1 CFLAGS='-Werror'
+  - NO_VALGRIND = 1 USE_STANDARD_TMPFILE=1 CFLAGS='-Werror'
+  - NO_VALGRIND = 1                        CFLAGS='-Werror -m32'
 
 install:
   - sudo pip install pytest
diff --git a/Makefile b/Makefile
index a29fd413..8f7e1d1d 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ endif
 
 # Test the functional test exes with valgrind (in 64bit mode only).
 test_valgrind : all
-ifeq ($(findstring m32,$(CFLAGS)),)
+ifndef NO_VALGRIND
 	$(Q)$(MAKE) -C test/functional/src test_valgrind
 	$(Q)$(MAKE) -C examples test_valgrind
 endif