diff --git a/ChangeLog b/ChangeLog
index 8a3bb1fde8..78ac7fabf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-05-12  Joseph Myers  <joseph@codesourcery.com>
 
+	* conform/data/time.h-data (getdate_err): Do not expect for
+	[XPG3].
+	(getdate): Likewise.
+	* conform/Makefile (test-xfail-XPG3/time.h/conform): Remove
+	variable.
+
 	* conform/data/unistd.h-data (F_LOCK): Do not expect for [XPG3].
 	(F_ULOCK): Likewise.
 	(F_TEST): Likewise.
diff --git a/conform/Makefile b/conform/Makefile
index 9aa79559d3..b46dc42f06 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -171,7 +171,6 @@ test-xfail-XPG3/signal.h/conform = yes
 test-xfail-XPG3/stdlib.h/conform = yes
 test-xfail-XPG3/string.h/conform = yes
 test-xfail-XPG3/sys/wait.h/conform = yes
-test-xfail-XPG3/time.h/conform = yes
 test-xfail-XPG4/arpa/inet.h/conform = yes
 test-xfail-XPG4/netdb.h/conform = yes
 test-xfail-XPG4/netinet/in.h/conform = yes
diff --git a/conform/data/time.h-data b/conform/data/time.h-data
index ddd9a074c8..9fbe54ed12 100644
--- a/conform/data/time.h-data
+++ b/conform/data/time.h-data
@@ -72,7 +72,7 @@ type locale_t
 tag {struct sigevent}
 # endif
 
-# if !defined POSIX && !defined POSIX2008
+# if !defined XPG3 && !defined POSIX && !defined POSIX2008
 variable int getdate_err
 # endif
 
@@ -91,7 +91,7 @@ function int clock_nanosleep (clockid_t, int, const struct timespec*, struct tim
 function int clock_settime (clockid_t, const struct timespec*)
 #endif
 function {char*} ctime_r (const time_t*, char*)
-# if !defined POSIX && !defined POSIX2008
+# if !defined XPG3 && !defined POSIX && !defined POSIX2008
 function {struct tm*} getdate (const char*)
 # endif
 function {struct tm*} gmtime_r (const time_t*, struct tm*)