diff --git a/ChangeLog b/ChangeLog
index cbdc3a4dce..c5ea3a223b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-12-02  Joseph Myers  <joseph@codesourcery.com>
 
+	* conform/Makefile (test-xfail-XOPEN2K/aio.h/linknamespace):
+	Remove variable.
+	(test-xfail-XOPEN2K8/aio.h/linknamespace): Likewise.
+
 	[BZ #17668]
 	* inet/ifaddrs.c (getifaddrs): Rename to __getifaddrs and define
 	as weak alias of __getifaddrs.  Use libc_hidden_weak.
diff --git a/conform/Makefile b/conform/Makefile
index 8f07d87ca5..f84aef2277 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -406,7 +406,6 @@ test-xfail-UNIX98/time.h/linknamespace = yes
 test-xfail-UNIX98/unistd.h/linknamespace = yes
 test-xfail-UNIX98/wchar.h/linknamespace = yes
 test-xfail-UNIX98/wordexp.h/linknamespace = yes
-test-xfail-XOPEN2K/aio.h/linknamespace = yes
 test-xfail-XOPEN2K/fcntl.h/linknamespace = yes
 test-xfail-XOPEN2K/fmtmsg.h/linknamespace = yes
 test-xfail-XOPEN2K/fnmatch.h/linknamespace = yes
@@ -442,7 +441,6 @@ test-xfail-POSIX2008/semaphore.h/linknamespace = yes
 test-xfail-POSIX2008/spawn.h/linknamespace = yes
 test-xfail-POSIX2008/time.h/linknamespace = yes
 test-xfail-POSIX2008/unistd.h/linknamespace = yes
-test-xfail-XOPEN2K8/aio.h/linknamespace = yes
 test-xfail-XOPEN2K8/dirent.h/linknamespace = yes
 test-xfail-XOPEN2K8/fcntl.h/linknamespace = yes
 test-xfail-XOPEN2K8/fmtmsg.h/linknamespace = yes