diff --git a/ChangeLog b/ChangeLog
index 9db2d9dd6..4c3cd6896 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-27  Carl Worth  <cworth@cworth.org>
 
+	* test/Makefile.am (AM_LDFLAGS): Fix to always link tests against
+	locally built library, not installed version.
+
 	* test/fill_rule.c: Add new test for cairo_set_fill_rule. Also
 	demonstrate some of the current tessellation bugs with the version
 	of the code that is in CVS.
diff --git a/test/Makefile.am b/test/Makefile.am
index 13216d72d..2f80f9f89 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -31,7 +31,7 @@ check_PROGRAMS = $(TESTS)
 # problem.
 INCLUDES = -D_GNU_SOURCE -I$(srcdir) $(CAIRO_CFLAGS) -I$(srcdir)/../src
 
-AM_LDFLAGS = $(CAIRO_LIBS) -L../src -lcairo
+AM_LDFLAGS = $(CAIRO_LIBS) ../src/libcairo.la
 
 cairo_test_lib =\
 cairo_test.c	\