diff --git a/ChangeLog b/ChangeLog
index 83cd84bf99f300fb9c5bf8c1880b0564ec8a7efa..548c603ffbe210b26650a0e0f0b5b05948ac4e96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-09-20  Niels Möller  <nisse@lysator.liu.se>
 
+	* testsuite/Makefile.in (VALGRIND): New variable, to make valgrind
+	checking easier.
+
 	* configure.ac: New substitution IF_CXX, replacing CXX_TESTS.
 	(dummy-dep-files): Handle .cxx files.
 
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 256bcf6d48e2abe090e81bbbf1e55138f7f8c28b..55598867fa6e84b909193d3d4ee63a5ec0b65113 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -95,6 +95,13 @@ include $(srcdir)/.test-rules.make
 $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
 	../libnettle.a @IF_HOGWEED@ ../libhogweed.a
 
+# For use as, e.g.,
+#
+#   make check EMULATOR='$(VALGRIND)'
+#   make check EMULATOR='$(VALGRIND) --log-fd=3' 3>valgrind.log
+
+VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes
+
 # The PATH update is for locating dlls on w*ndows.
 check: $(TS_ALL)
 	LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \