diff --git a/configure.ac b/configure.ac
index 43c79ca..bbc3863 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,9 @@ AS_CASE([$host],
 )
 AC_MSG_RESULT([$os])
 
+AC_CHECK_PROG(HAVE_VALGRIND, valgrind, yes, no)
+AM_CONDITIONAL([USE_VALGRIND], [test x$HAVE_VALGRIND = xyes])
+
 AC_CHECK_LIB(m, log10)
 
 PKG_CHECK_MODULES(FFMPEG, [libavformat >= 54.2 libavcodec >= 53.25 libavutil >= 51.18])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fa6c611..0eb06dc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,9 @@
 TESTS = test
 
+if USE_VALGRIND
+TESTS_ENVIRONMENT = valgrind --leak-check=full --quiet --error-exitcode=1
+endif
+
 check_PROGRAMS = $(TESTS)
 
 test_SOURCES = \