diff --git a/ChangeLog b/ChangeLog
index 4766d149f9..f5a1dc8063 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-05-19  Joseph Myers  <joseph@codesourcery.com>
+
+	* conform/data/search.h-data (insque): Do not expect for [XPG3].
+	(remque): Likewise.
+	* conform/Makefile (test-xfail-XPG3/search.h/conform): Remove
+	variable.
+
 2016-05-18  Joseph Myers  <joseph@codesourcery.com>
 
 	* math/libm-test.inc: Update comment not to refer to signs of NaNs
diff --git a/conform/Makefile b/conform/Makefile
index 6c7b683ec2..eb64e0e802 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -166,7 +166,6 @@ test-xfail-XOPEN2K8/ndbm.h/conform = yes
 test-xfail-XPG3/ftw.h/conform = yes
 test-xfail-XPG3/limits.h/conform = yes
 test-xfail-XPG3/pwd.h/conform = yes
-test-xfail-XPG3/search.h/conform = yes
 test-xfail-XPG3/signal.h/conform = yes
 test-xfail-XPG3/sys/wait.h/conform = yes
 test-xfail-XPG4/arpa/inet.h/conform = yes
diff --git a/conform/data/search.h-data b/conform/data/search.h-data
index 3abbc6690f..3d66fdf90d 100644
--- a/conform/data/search.h-data
+++ b/conform/data/search.h-data
@@ -17,10 +17,14 @@ constant leaf
 function int hcreate (size_t)
 function void hdestroy (void)
 function {ENTRY*} hsearch (ENTRY, ACTION)
+#ifndef XPG3
 function void insque (void*, void*)
+#endif
 function {void*} lfind (const void*, const void*, size_t*, size_t, int (*)(const void*, const void*))
 function {void*} lsearch (const void*, void*, size_t*, size_t, int (*)(const void*, const void*))
+#ifndef XPG3
 function void remque (void*)
+#endif
 function {void*} tdelete (const void*, void**, int(*)(const void*, const void*))
 function {void*} tfind (const void*, void*const*, int(*)(const void*, const void*))
 function {void*} tsearch (const void*, void**, int(*)(const void*, const void*))