diff --git a/build/exe.mk b/build/exe.mk
index bc16463d..8ce2b9dc 100644
--- a/build/exe.mk
+++ b/build/exe.mk
@@ -46,7 +46,7 @@ DEBUG_PROGRAM   = $(DEBUG_BINPATH)/$(PROGRAM_NAME)
 RELEASE_PROGRAM = $(RELEASE_BINPATH)/$(PROGRAM_NAME)
 
 debug   : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
-valgrind: CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
+valgrind: CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
 release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
 
 LFLAGS  = -L$(LIBPATH)
diff --git a/build/lib.mk b/build/lib.mk
index d0d80a2c..8d432e37 100644
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -56,7 +56,7 @@ LINKD       = $(CC) -shared
 endif
 
 debug   : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
-valgrind: CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
+valgrind: CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
 release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
 
 LFLAGS  = -L$(LIBPATH)
diff --git a/configure.in b/configure.in
index 098124f8..fffd5d13 100644
--- a/configure.in
+++ b/configure.in
@@ -216,6 +216,9 @@ AC_ARG_ENABLE(exhaustive-tests,
 	*) AC_MSG_ERROR(bad value ${enableval} for --enable-exhaustive-tests) ;;
 esac],[exhaustive_tests=false])
 AM_CONDITIONAL(FLaC__EXHAUSTIVE_TESTS, test x$exhaustive_tests = xtrue)
+if test x$exhaustive_tests = xtrue ; then
+AC_DEFINE(FLAC__EXHAUSTIVE_TESTS)
+fi
 
 AC_ARG_ENABLE(valgrind-testing,
 [  --enable-valgrind-testing      Run all tests inside Valgrind],
@@ -225,6 +228,9 @@ AC_ARG_ENABLE(valgrind-testing,
 	*) AC_MSG_ERROR(bad value ${enableval} for --enable-valgrind-testing) ;;
 esac],[valgrind_testing=false])
 AM_CONDITIONAL(FLaC__VALGRIND_TESTING, test x$valgrind_testing = xtrue)
+if test x$valgrind_testing = xtrue ; then
+AC_DEFINE(FLAC__VALGRIND_TESTING)
+fi
 
 dnl check for ogg library
 XIPH_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development enviroment not installed - Ogg support will not be built]))