diff --git a/configure.ac b/configure.ac
index 69da66f..ed927d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,15 @@
     AX_RESTORE_FLAGS_WITH_PREFIX(OLD, [LDFLAGS])
 ])
 
+# Check for valgrind
+m4_foreach([vgtool], [valgrind_tool_list],
+    [AX_VALGRIND_DFLT(vgtool, [off])])
+AX_VALGRIND_DFLT([memcheck], [on])
+AX_VALGRIND_CHECK
+AM_EXTRA_RECURSIVE_TARGETS([check-valgrind])
+m4_foreach([vgtool], [valgrind_tool_list],
+    [AM_EXTRA_RECURSIVE_TARGETS([check-valgrind-]vgtool)])
+
 # Code coverage
 AX_CODE_COVERAGE
 AM_EXTRA_RECURSIVE_TARGETS([check-code-coverage])
diff --git a/test/Makefile.am b/test/Makefile.am
index c0fc378..5848c67 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,3 +1,4 @@
+@VALGRIND_CHECK_RULES@
 @CODE_COVERAGE_RULES@
 
 if WANT_LIBSDBUSPLUS