---
 tests/Makefile.am |    4 +---
 tools/Makefile.am |    5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,13 @@
 SUBDIRS = tables tablesWithMetadata yaml braille-specs ueb_test_data
 
 AM_CPPFLAGS =					\
-	-I$(top_srcdir)/liblouis		\
 	-I$(top_srcdir)/gnulib			\
 	-I$(top_srcdir)/tools			\
 	-I$(top_builddir)/gnulib		\
 	-I$(top_builddir)/tools
 
 LDADD =							\
-	$(top_builddir)/liblouis/liblouis.la		\
+	-llouis						\
 	$(top_builddir)/gnulib/libgnu.la		\
 	$(top_builddir)/tools/libbrlcheck.la		\
 	$(top_builddir)/tools/gnulib/libgnutools.la	\
@@ -230,7 +229,6 @@ TESTS =				     \
 AM_TESTS_ENVIRONMENT =								\
 	LOUIS_TABLEPATH=$(abs_top_srcdir)					\
 	UEB_TEST_DATA_PATH=$(top_srcdir)/tests/ueb_test_data			\
-	LD_LIBRARY_PATH=$(top_builddir)/liblouis/.libs:$$LD_LIBRARY_PATH	\
 	PATH=$(top_builddir)/tools:$$PATH					\
 	WINE=$(WINE)								\
 	EXEEXT=$(EXEEXT)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,7 +2,6 @@ SUBDIRS = gnulib lou_maketable.d
 
 AM_CPPFLAGS =					\
 	$(WARN_CFLAGS)				\
-	-I$(top_srcdir)/liblouis		\
 	-I$(top_srcdir)/tools/gnulib		\
 	-I$(top_builddir)/tools/gnulib
 
@@ -12,7 +11,7 @@ lou_checkyaml_CPPFLAGS = $(AM_CPPFLAGS)
 lou_compare_CPPFLAGS = $(AM_CPPFLAGS) -w
 
 LDADD =							\
-	$(top_builddir)/liblouis/liblouis.la		\
+	-llouis						\
 	$(top_builddir)/tools/gnulib/libgnutools.la	\
 	libbrlcheck.la		\
 	$(LTLIBINTL)
@@ -32,7 +31,7 @@ libbrlcheck_la_SOURCES =			\
 # liblouis library. Otherwise we get missing symbol errors when
 # compiling the test suite, which depends on libbrlcheck.
 libbrlcheck_la_LIBADD =					\
-	$(top_builddir)/liblouis/liblouis.la		\
+	-llouis						\
 	$(top_builddir)/tools/gnulib/libgnutools.la
 
 lou_checkyaml_LDADD = $(LDADD) $(YAML_LIBS)
