diff --git a/ChangeLog b/ChangeLog
index ff894bc7..96eb7815 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2007-02-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* tests/convenience.at: Use $CPPFLAGS for compilation.
+	* tests/deplibs-ident.at: Likewise.
+	* tests/duplicate_members.at: Likewise.
+	* tests/inherited_flags.at: Likewise.
+	* tests/link-order.at: Likewise.
+	* tests/stresstest.at: Likewise.
+	* tests/early-libtool.at: Likewise.  Do not quote $CC.
+
 	* libltdl/ltdl.c (lt_dlexit): Add casts to fix compilation with
 	C++ compiler again.
 
diff --git a/tests/convenience.at b/tests/convenience.at
index a1c4f921..78a1fdfb 100644
--- a/tests/convenience.at
+++ b/tests/convenience.at
@@ -1,5 +1,5 @@
 # Hand crafted tests for GNU Libtool.                         -*- Autotest -*-
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005, 2007 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,8 +38,8 @@ int main(void) { return a1() + a2() + a3() != 6; }
 EOF
 for i in 1 2 3; do 
   echo "int a$i(void) { return $i; }" > a$i.c
-  $LIBTOOL --mode=compile $CC $CFLAGS -c main$i.c
-  $LIBTOOL --mode=compile $CC $CFLAGS -c a$i.c
+  $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c main$i.c
+  $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a$i.c
   $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba$i.la a$i.lo
 done
 AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba12.la liba1.la liba2.la -rpath /notexist],
diff --git a/tests/deplibs-ident.at b/tests/deplibs-ident.at
index 719a1782..36a451c3 100644
--- a/tests/deplibs-ident.at
+++ b/tests/deplibs-ident.at
@@ -1,5 +1,5 @@
 # Hand crafted tests for GNU Libtool.                         -*- Autotest -*-
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005, 2007 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,7 +29,8 @@ AT_KEYWORDS([libtool])
 
 mkdir a a/b c
 echo 'int c() { return 0; }' > c/libcee.c
-AT_CHECK([$LIBTOOL --mode=compile $CC $CFLAGS -c c/libcee.c -o c/libcee.lo],[0],[ignore],[ignore])
+AT_CHECK([$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c c/libcee.c -o c/libcee.lo],
+	 [0],[ignore],[ignore])
 AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o c/libcee.la c/libcee.lo -rpath /nowhere],
 	 [0],[ignore],[ignore])
 
@@ -42,7 +43,8 @@ depl_3="-L../c -lcee"
   for i in 1 2 3; do
     eval depend_on_c=\"\$depl_$i\"
     echo "extern int c(void); int a$i() { return c(); }" > liba$i.c
-    AT_CHECK([$LIBTOOL --mode=compile $CC $CFLAGS -c liba$i.c],[0],[ignore],[ignore])
+    AT_CHECK([$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c liba$i.c],
+	     [0],[ignore],[ignore])
     AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba$i.la liba$i.lo $depend_on_c -rpath /nowhere],
 	   [0],[ignore],[ignore])
   done
diff --git a/tests/duplicate_members.at b/tests/duplicate_members.at
index 8c6841d1..75084f6a 100755
--- a/tests/duplicate_members.at
+++ b/tests/duplicate_members.at
@@ -1,5 +1,5 @@
 # Hand crafted tests for GNU Libtool.                         -*- Autotest -*-
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005, 2007 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -53,15 +53,15 @@ done
 
 for a in 1 2 3 4 5 6
 do
-  $LIBTOOL --mode=compile --tag=CC $CC -c $CFLAGS -o $a/a.lo $a/a.c
+  $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o $a/a.lo $a/a.c
 done
 $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libc0.la 6/a.lo
 $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libconv.la 1/a.lo 2/a.lo 3/a.lo 4/a.lo 5/a.lo libc0.la
 
-$LIBTOOL --mode=compile --tag=CC $CC -c $CFLAGS -o bar.lo bar.c
+$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o bar.lo bar.c
 $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbar.la bar.lo libconv.la -rpath /notexist
 
-$LIBTOOL --mode=compile --tag=CC $CC -c $CFLAGS -o main.lo main.c
+$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o main.lo main.c
 $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo ./libbar.la
 
 LT_AT_EXEC_CHECK([./main],[0],[ignore],[ignore])
diff --git a/tests/early-libtool.at b/tests/early-libtool.at
index 14e4b160..f827c948 100644
--- a/tests/early-libtool.at
+++ b/tests/early-libtool.at
@@ -1,5 +1,5 @@
 # Hand crafted tests for GNU Libtool.                         -*- Autotest -*-
-# Copyright 2005, 2006 Free Software Foundation, Inc.
+# Copyright 2005, 2006, 2007 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -137,9 +137,9 @@ hello (void)
 _EOF
 
 # Prove that we can run libtool from inside configure:
-$SHELL ./libtool --mode=compile --tag=CC "$CC" $CPPFLAGS $CFLAGS \
+$SHELL ./libtool --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS \
     -I. -I$srcdir -c -o hello.lo hello.c  || exit 1
-$SHELL ./libtool --mode=link --tag=CC "$CC" $CFLAGS $LDFLAGS \
+$SHELL ./libtool --mode=link --tag=CC $CC $CFLAGS $LDFLAGS \
     -o libhello.la -rpath /notexist hello.lo || exit 1
 
 AC_CONFIG_FILES([Makefile])
diff --git a/tests/inherited_flags.at b/tests/inherited_flags.at
index 2dd60fe5..d56f656a 100644
--- a/tests/inherited_flags.at
+++ b/tests/inherited_flags.at
@@ -1,5 +1,5 @@
 # Hand crafted tests for GNU Libtool.                         -*- Autotest -*-
-# Copyright 2004, 2006 Free Software Foundation, Inc.
+# Copyright 2004, 2006, 2007 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -40,10 +40,10 @@ AT_DATA([main.c],
 int main() { return 0;}
 ])
 
-$LIBTOOL --mode=compile --tag=CC $CC $CFLAGS -c -o foo.lo foo.c
-$LIBTOOL --mode=compile --tag=CC $CC $CFLAGS -c -o bar.lo bar.c
-$LIBTOOL --mode=compile --tag=CC $CC $CFLAGS -c -o baz.lo baz.c
-$LIBTOOL --mode=compile --tag=CC $CC $CFLAGS -c -o main.lo main.c
+$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o foo.lo foo.c
+$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o bar.lo bar.c
+$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o baz.lo baz.c
+$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o main.lo main.c
 $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libfoo.la foo.lo -rpath /usr/local/lib -no-undefined
 $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbar.la bar.lo -rpath /usr/local/lib -no-undefined
 
diff --git a/tests/link-order.at b/tests/link-order.at
index 615b23e7..9e9631ae 100644
--- a/tests/link-order.at
+++ b/tests/link-order.at
@@ -1,5 +1,5 @@
 # Hand crafted tests for GNU Libtool.                         -*- Autotest -*-
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005, 2007 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ AT_DATA(src/c.c,
 [[int c = 1;
 ]])
 
-$LIBTOOL --mode=compile $CC $CFLAGS -c src/c.c -o src/c.lo
+$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c src/c.c -o src/c.lo
 $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o src/libcee.la src/c.lo -rpath $prefix_old/lib
 $LIBTOOL --mode=install cp src/libcee.la $prefix_old/lib/libcee.la
 
@@ -54,8 +54,8 @@ int b_$i() { return 1 + c; }
 EOF
 
   prefix=`eval echo \\$prefix_$i`
-  $LIBTOOL --mode=compile $CC $CFLAGS -c src/a_$i.c -o src/a.lo
-  $LIBTOOL --mode=compile $CC $CFLAGS -c src/b_$i.c -o src/b.lo
+  $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c src/a_$i.c -o src/a.lo
+  $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c src/b_$i.c -o src/b.lo
   $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o src/libb.la src/b.lo \
       -L$prefix_old/lib -lcee -rpath $prefix/lib
   $LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o src/liba.la src/a.lo \
@@ -94,7 +94,7 @@ int main(void) { return a_$i() != 3; }
 EOF
 
   prefix=`eval echo \\$prefix_$i`
-  $LIBTOOL --mode=compile $CC $CFLAGS -c src/main_$i.c -o src/main_$i.lo
+  $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c src/main_$i.c -o src/main_$i.lo
   AT_CHECK($LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o src/main_$i src/main_$i.lo -L$prefix/lib -la,
 	   [0], [ignore], [ignore])
   LT_AT_EXEC_CHECK([src/main_$i])
diff --git a/tests/stresstest.at b/tests/stresstest.at
index 587f9532..f8cf87b6 100644
--- a/tests/stresstest.at
+++ b/tests/stresstest.at
@@ -195,10 +195,10 @@ w15
 ]])
 
 
-AT_CHECK([$LIBTOOL --mode=compile $CC $CFLAGS -c a.c -o sub/a.lo],[0],[ignore],[ignore])
-AT_CHECK([$LIBTOOL --mode=compile $CC $CFLAGS -c b.c -o sub/b.lo],[0],[ignore],[ignore])
-AT_CHECK([$LIBTOOL --mode=compile $CC $CFLAGS -c main.c],[0],[ignore],[ignore])
-AT_CHECK([$LIBTOOL --mode=compile $CC $CFLAGS -c dlself.c -o sub3/dlself.lo],[0],[ignore],[ignore])
+AT_CHECK([$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a.c -o sub/a.lo],[0],[ignore],[ignore])
+AT_CHECK([$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c b.c -o sub/b.lo],[0],[ignore],[ignore])
+AT_CHECK([$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c main.c],[0],[ignore],[ignore])
+AT_CHECK([$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c dlself.c -o sub3/dlself.lo],[0],[ignore],[ignore])
 
 case $allow_undefined_flag in
   unsupported) undef_opts=-no-undefined ;;