diff --git a/ChangeLog b/ChangeLog
index ad8fe210aa..35d61bd3cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-12-11  Roland McGrath  <roland@hack.frob.com>
 
+	* misc/tst-error1.c (do_test): Ignore -Wformat-security for
+	generated error format strings.
+
 	* stdio-common/tstdiomisc.c (t2): Ignore -Wformat and
 	-Wformat-extra-args warnings for scanf formats.
 	* stdio-common/scanf4.c (main): Ignore -Wformat-zero-length around
diff --git a/misc/tst-error1.c b/misc/tst-error1.c
index e84843ed2f..a97a22ce9d 100644
--- a/misc/tst-error1.c
+++ b/misc/tst-error1.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <wchar.h>
+#include <libc-internal.h>
 
 static int
 do_test (int argc, char *argv[])
@@ -16,8 +17,18 @@ do_test (int argc, char *argv[])
   for (int i = 0; i < 1000; ++i)
     memcpy (&buf[i * (sizeof (str) - 1)], str, sizeof (str));
   error (0, 0, str);
+
+  /* We're testing a large format string here and need to generate it
+     to avoid this source file being ridiculous.  So disable the warning
+     about a generated format string.  */
+  DIAG_PUSH_NEEDS_COMMENT;
+  DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat-security");
+
   error (0, 0, buf);
   error (0, 0, buf);
+
+  DIAG_POP_NEEDS_COMMENT;
+
   error (0, 0, str);
   return 0;
 }