diff --git a/configure.ac b/configure.ac
index 2d4c5830a..c8536a077 100644
--- a/configure.ac
+++ b/configure.ac
@@ -648,6 +648,7 @@ then
         AC_MSG_ERROR([Valgrind not found.])
     fi
     enable_shared=no
+    AM_CFLAGS="$AM_CFLAGS -DHAVE_VALGRIND"
 fi
 
 AM_CONDITIONAL([USE_VALGRIND], [test "x$ENABLED_VALGRIND" = "xyes"])
diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c
index 956a3d1f3..80a8c878f 100644
--- a/testsuite/testsuite.c
+++ b/testsuite/testsuite.c
@@ -66,7 +66,7 @@ int main(int argc, char** argv)
     args.argv = server_args.argv = argv;
 
     CyaSSL_Init();
-#ifdef DEBUG_CYASSL
+#if defined(DEBUG_CYASSL) && !defined(HAVE_VALGRIND)
     CyaSSL_Debugging_ON();
 #endif