diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 1f9ba54..61b4d64 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -34,4 +34,4 @@ LDADD = ../libykpiv.la
 check_PROGRAMS = basic parse_key
 TESTS = $(check_PROGRAMS)
 
-TESTS_ENVIRONMENT = $(VALGRIND)
+LOG_COMPILER = $(VALGRIND)
diff --git a/tool/tests/Makefile.am b/tool/tests/Makefile.am
index b0d9766..7148d1d 100644
--- a/tool/tests/Makefile.am
+++ b/tool/tests/Makefile.am
@@ -26,7 +26,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 TESTS_ENVIRONMENT = export VERSION=$(PACKAGE_VERSION); export EXEEXT=$(EXEEXT);
-TESTS_ENVIRONMENT += $(VALGRIND)
+
+LOG_COMPILER = $(VALGRIND)
 
 AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib