diff --git a/ChangeLog b/ChangeLog
index 832eed1f14..824d4f2817 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2015-10-27  Joseph Myers  <joseph@codesourcery.com>
 
+	* conform/Makefile (test-xfail-ISO11/complex.h/conform): Remove
+	variable.
+	(test-xfail-ISO11/stdalign.h/conform): Likewise.
+	(test-xfail-ISO11/stdnoreturn.h/conform): Likewise.
+
 	* conform/GlibcConform.pm ($CFLAGS{"ISO11"}): Use -std=c11 instead
 	of -std=c1x -D_ISOC11_SOURCE.
 
diff --git a/conform/Makefile b/conform/Makefile
index 1a763691c7..d25fc97a83 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -150,11 +150,6 @@ $(conformtest-header-list-tests): $(objpfx)header-list-%.out: \
 		 "$(conformtest-headers-data)" > $@; \
 	$(evaluate-test)
 
-# GCC 4.6 and earlier lack features required by these tests.
-test-xfail-ISO11/complex.h/conform = yes
-test-xfail-ISO11/stdalign.h/conform = yes
-test-xfail-ISO11/stdnoreturn.h/conform = yes
-
 # Pre-standard C feature no longer supported by GCC (obsoleted in
 # newer POSIX standards).
 test-xfail-XPG3/varargs.h/conform = yes