diff --git a/ChangeLog b/ChangeLog
index 3aa137c81d..d5aeddc400 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-12-29  Chris Metcalf  <cmetcalf@ezchip.com>
 
+	* sysdeps/unix/sysv/linux/tst-setgetname.c (do_test): Use #ifndef
+	instead of #if to avoid a Wundef warning.
+	* stdlib/tst-limits.c (do_test): Likewise.
+
 	* sysdeps/tile/math_private.h (fetestexcept): Add macro to
 	parallel other exception macros.
 	(fegetenv): Convert from macro to extern inline so that it applies
diff --git a/stdlib/tst-limits.c b/stdlib/tst-limits.c
index 6e51dcadb5..9aabc360f6 100644
--- a/stdlib/tst-limits.c
+++ b/stdlib/tst-limits.c
@@ -58,7 +58,7 @@ do_test (void)
   /* Values from POSIX and Unix.  */
 #ifdef PAGESIZE
   TEST (PAGESIZE, "d", getpagesize ());
-#elif PAGE_SIZE
+#elif defined (PAGE_SIZE)
   TEST (PAGE_SIZE, "d", getpagesize ());
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/tst-setgetname.c b/sysdeps/unix/sysv/linux/tst-setgetname.c
index f5693e26c4..7799ebe57b 100644
--- a/sysdeps/unix/sysv/linux/tst-setgetname.c
+++ b/sysdeps/unix/sysv/linux/tst-setgetname.c
@@ -101,7 +101,7 @@ do_test (int argc, char **argv)
     {
       res = get_self_comm (gettid (), name_check, TASK_COMM_LEN);
 
-#if !__ASSUME_PROC_PID_TASK_COMM
+#ifndef __ASSUME_PROC_PID_TASK_COMM
       /* On this first test we look for ENOENT to be returned from
          get_self_comm to indicate that the kernel is older than
          2.6.33 and doesn't contain comm within the proc structure.