diff --git a/crypto/Makefile b/crypto/Makefile
index f63659481..c9d514732 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -51,10 +51,12 @@ ZKP_PATH = ../vendor/secp256k1-zkp
 CFLAGS += -DSECP256K1_CONTEXT_SIZE=208
 
 VALGRIND ?= 1
+ifeq ($(VALGRIND),1)
+CFLAGS += -DVALGRIND
+endif
 
 CFLAGS += -I.
 CFLAGS += -I..
-CFLAGS += -DVALGRIND=$(VALGRIND)
 CFLAGS += -DUSE_ETHEREUM=1
 CFLAGS += -DUSE_GRAPHENE=1
 CFLAGS += -DUSE_KECCAK=1
diff --git a/crypto/tests/test_check.c b/crypto/tests/test_check.c
index 8be73e176..5d27d5861 100644
--- a/crypto/tests/test_check.c
+++ b/crypto/tests/test_check.c
@@ -32,7 +32,7 @@
 
 #include "check_mem.h"
 
-#if VALGRIND
+#ifdef VALGRIND
 #include <valgrind/memcheck.h>
 #include <valgrind/valgrind.h>
 #endif
@@ -77,7 +77,7 @@
 #include "zkp_context.h"
 #include "zkp_ecdsa.h"
 
-#if VALGRIND
+#ifdef VALGRIND
 /*
  * This is a clever trick to make Valgrind's Memcheck verify code
  * is constant-time with respect to secret data.