diff --git a/ChangeLog b/ChangeLog
index 4f1cdc4d..ce199fc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* tests/configure-iface.at: Ensure LTDLINCL is expanded
+	before CPPFLAGS, so that even CPPFLAGS=-I/usr/local/include
+	won't make the tests prefer an installed ltdl.h over the
+	in-package one.
+	Report by Bob Friesenhahn.
+
 2008-01-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS) <exclude_expsyms>:
diff --git a/tests/configure-iface.at b/tests/configure-iface.at
index 72479bdb..10d8026d 100644
--- a/tests/configure-iface.at
+++ b/tests/configure-iface.at
@@ -1,6 +1,6 @@
 # configure-iface.at -- test ltdl configure interface         -*- Autotest -*-
 #
-#   Copyright (C) 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2007
 #
 #   This file is part of GNU Libtool.
@@ -124,7 +124,7 @@ AT_DATA([Makefile.am],
 
 SUBDIRS			= libltdl
 
-AM_CFLAGS		= $(LTDLINCL)
+AM_CPPFLAGS		= $(LTDLINCL)
 
 lib_LTLIBRARIES		= libmodule.la
 libmodule_la_LDFLAGS	= -module
@@ -188,7 +188,7 @@ AC_OUTPUT
 AT_DATA([Makefile.am],
 [[AUTOMAKE_OPTIONS	= 1.7
 
-AM_CFLAGS		= $(LTDLINCL)
+AM_CPPFLAGS		= $(LTDLINCL)
 
 lib_LTLIBRARIES		= libmodule.la
 libmodule_la_LDFLAGS	= -module
@@ -241,7 +241,7 @@ AT_DATA([Makefile.am],
 
 SUBDIRS			= libltdl
 
-AM_CFLAGS		= $(LTDLINCL)
+AM_CPPFLAGS		= $(LTDLINCL)
 
 lib_LTLIBRARIES		= libmodule.la
 libmodule_la_LDFLAGS	= -module
diff --git a/tests/lt_dladvise.at b/tests/lt_dladvise.at
index 5945c740..c67b3a05 100644
--- a/tests/lt_dladvise.at
+++ b/tests/lt_dladvise.at
@@ -1,6 +1,6 @@
 # lt_dladvise.at -- test libltdl functionality                -*- Autotest -*-
 #
-#   Copyright (C) 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2007
 #
 #   This file is part of GNU Libtool.
@@ -267,7 +267,7 @@ depend: 5
 : ${LTDLINCL="-I$abs_top_srcdir/libltdl"}
 : ${LIBLTDL="$abs_builddir/../libltdl/libltdlc.la"}
 
-CPPFLAGS="$CPPFLAGS $LTDLINCL"
+CPPFLAGS="$LTDLINCL $CPPFLAGS"
 
 dlopenable='resident local global'
 
diff --git a/tests/lt_dlexit.at b/tests/lt_dlexit.at
index 207c6437..2229f192 100644
--- a/tests/lt_dlexit.at
+++ b/tests/lt_dlexit.at
@@ -1,6 +1,6 @@
 # lt_dlexit.at -- test libltdl functionality                  -*- Autotest -*-
 #
-#   Copyright (C) 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 #   Written by Dave Brolley & Ralf Wildenhues, 2007
 #
 #   This file is part of GNU Libtool.
@@ -134,7 +134,7 @@ int vb1 = 3;
 : ${LTDLINCL="-I$abs_top_srcdir/libltdl"}
 : ${LIBLTDL="$abs_builddir/../libltdl/libltdlc.la"}
 
-CPPFLAGS="$CPPFLAGS $LTDLINCL"
+CPPFLAGS="$LTDLINCL $CPPFLAGS"
 LDFLAGS="$LDFLAGS -no-undefined"
 
 for file in a1 b1; do
diff --git a/tests/need_lib_prefix.at b/tests/need_lib_prefix.at
index d9cf769e..a712813a 100644
--- a/tests/need_lib_prefix.at
+++ b/tests/need_lib_prefix.at
@@ -1,6 +1,6 @@
 # need-lib-prefix.at -- test libltdl functionality            -*- Autotest -*-
 #
-#   Copyright (C) 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2007
 #
 #   This file is part of GNU Libtool.
@@ -139,7 +139,7 @@ libfoo2: 3
 : ${LTDLINCL="-I$abs_top_srcdir/libltdl"}
 : ${LIBLTDL="$abs_builddir/../libltdl/libltdlc.la"}
 
-CPPFLAGS="$CPPFLAGS $LTDLINCL"
+CPPFLAGS="$LTDLINCL $CPPFLAGS"
 LDFLAGS="$LDFLAGS"
 
 # Create our own libtool, forcing need_lib_prefix setting
diff --git a/tests/old-m4-iface.at b/tests/old-m4-iface.at
index a998c4b6..b43fff7a 100644
--- a/tests/old-m4-iface.at
+++ b/tests/old-m4-iface.at
@@ -1,6 +1,6 @@
 # old-m4-iface.at -- exercise old m4 interface to libtool     -*- Autotest -*-
 #
-#   Copyright (C) 2005 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2008 Free Software Foundation, Inc.
 #   Written by Gary V. Vaughan, 2005
 #
 #   This file is part of GNU Libtool.
@@ -109,7 +109,7 @@ AC_OUTPUT(Makefile)
 AT_DATA([Makefile.in],
 [[top_srcdir	= .
 top_builddir	= .
-COMPILE		= @CC@ @CPPFLAGS@ @INCLTDL@  @CFLAGS@
+COMPILE		= @CC@ @INCLTDL@  @CPPFLAGS@ @CFLAGS@
 LTCOMPILE	= @LIBTOOL@ --mode=compile $(COMPILE)
 LTLINK		= @LIBTOOL@ --mode=link @CC@ -no-undefined @CFLAGS@ @LDFLAGS@ -o $@
 SHELL		= @SHELL@