diff --git a/conform/data/signal.h-data b/conform/data/signal.h-data
index 496c062837..15622cca7c 100644
--- a/conform/data/signal.h-data
+++ b/conform/data/signal.h-data
@@ -124,7 +124,7 @@ constant SA_ONSTACK
 constant SA_RESETHAND
 constant SA_RESTART
 // Bug 23090: hurd: missing SA_NOCLDWAIT support.
-xfail[i386-gnu]-constant SA_NOCLDWAIT
+xfail[i386-gnu|x86_64-gnu]-constant SA_NOCLDWAIT
 constant SA_NODEFER
 # endif
 # if !defined XPG4 && !defined POSIX && !defined POSIX2008
diff --git a/sysdeps/mach/hurd/x86_64/Makefile b/sysdeps/mach/hurd/x86_64/Makefile
new file mode 100644
index 0000000000..80cf2eb6dc
--- /dev/null
+++ b/sysdeps/mach/hurd/x86_64/Makefile
@@ -0,0 +1,5 @@
+ifeq ($(subdir),conform)
+# For bug 23090
+# (missing SA_NOCLDWAIT)
+conformtest-xfail-conds += x86_64-gnu
+endif