diff --git a/ChangeLog b/ChangeLog
index c9bd9b4ad1..4d71f26e03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-05-31  Mike Frysinger  <vapier@gentoo.org>
+
+	* debug/Makefile (CFLAGS-tst-longjmp_chk.c): Delete
+	-D_FORTIFY_SOURCE=1.
+	(CPPFLAGS-tst-longjmp_chk.c): Define.
+	(CFLAGS-tst-longjmp_chk2.c): Delete -D_FORTIFY_SOURCE=1.
+	(CPPFLAGS-tst-longjmp_chk2.c): Define.
+	* wcsmbs/Makefile (CPPFLAGS-tst-wchar-h.c): Rename from
+	CFLAGS-tst-wchar-h.c.
+
 2012-05-31  Marek Polacek  <polacek@redhat.com>
 
 	[BZ #14132]
diff --git a/debug/Makefile b/debug/Makefile
index fb8c28572f..4c01a66e39 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -79,10 +79,14 @@ CFLAGS-pread_chk.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-pread64_chk.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-recv_chk.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-recvfrom_chk.c = -fexceptions -fasynchronous-unwind-tables
-CFLAGS-tst-longjmp_chk.c = -fexceptions -fasynchronous-unwind-tables \
-			   -D_FORTIFY_SOURCE=1
-CFLAGS-tst-longjmp_chk2.c = -fexceptions -fasynchronous-unwind-tables \
-			    -D_FORTIFY_SOURCE=1
+
+# Need to make sure the settings here override what configure might have
+# set up for us, so keep the CFLAGS/CPPFLAGS split logical as the order is:
+# <user CFLAGS> <test CFLAGS> <user CPPFLAGS> <test CPPFLAGS>
+CFLAGS-tst-longjmp_chk.c = -fexceptions -fasynchronous-unwind-tables
+CPPFLAGS-tst-longjmp_chk.c = -D_FORTIFY_SOURCE=1
+CFLAGS-tst-longjmp_chk2.c = -fexceptions -fasynchronous-unwind-tables
+CPPFLAGS-tst-longjmp_chk2.c = -D_FORTIFY_SOURCE=1
 
 # We know these tests have problems with format strings, this is what
 # we are testing.  Disable that warning.
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile
index 99d3d28ae7..983fd76f61 100644
--- a/wcsmbs/Makefile
+++ b/wcsmbs/Makefile
@@ -66,7 +66,7 @@ CFLAGS-wcstoull_l.c = $(strtox-CFLAGS)
 CFLAGS-wcstod_l.c = $(strtox-CFLAGS)
 CFLAGS-wcstold_l.c = $(strtox-CFLAGS)
 CFLAGS-wcstof_l.c = $(strtox-CFLAGS)
-CFLAGS-tst-wchar-h.c = -D_FORTIFY_SOURCE=2
+CPPFLAGS-tst-wchar-h.c = -D_FORTIFY_SOURCE=2
 
 CFLAGS-isoc99_wscanf.c += $(exceptions)
 CFLAGS-isoc99_fwscanf.c += $(exceptions)