diff --git a/Makefile.am b/Makefile.am
index d037258..49514e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I .
 aclocaldir = $(datadir)/aclocal
 
 SUBDIRS = \
diff --git a/configure.in b/configure.in
index 561fa49..36bf40c 100644
--- a/configure.in
+++ b/configure.in
@@ -2617,12 +2617,7 @@ if test "$docdir" = ""; then
 fi
 AC_SUBST(docdir)
 
-AC_CHECK_PROG(VALGRIND, valgrind, yes, no)
-if test $VALGRIND = yes; then
-  RUN_TEST='$(SHELL) $(top_srcdir)/run-test.sh'
-else
-  RUN_TEST=''
-fi
+RUN_TEST=''
 AC_SUBST(RUN_TEST)
 AC_SUBST(abs_top_builddir)