diff --git a/ChangeLog b/ChangeLog
index 9f844c019..31362af91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-10  Keith Packard  <keithp@keithp.com>
+
+	* test/Makefile.am:
+	Place private include directives before CAIRO_CFLAGS in case
+	pixman remains installed in the system.
+
 2005-08-10  Carl Worth  <cworth@cworth.org>
 
 	From Keith Packard <keithp@keithp.com>,
diff --git a/test/Makefile.am b/test/Makefile.am
index 8baedffea..27d8b373f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -133,11 +133,11 @@ check_PROGRAMS = $(TESTS)
 # problem.
 INCLUDES =					\
 	-D_GNU_SOURCE				\
-	$(CAIRO_CFLAGS)				\
 	-I$(srcdir)				\
 	-I$(top_srcdir)/pixman/src		\
 	-I$(top_builddir)/src			\
-	-I$(top_srcdir)/src
+	-I$(top_srcdir)/src			\
+	$(CAIRO_CFLAGS)
 
 noinst_LTLIBRARIES = libcairotest.la