--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-15  Simon Josefsson  <simon@josefsson.org>
+
+	* tests/test-xalloc-die.c: New file.
+	* modules/xalloc-die-tests: New file.
+	* gnulib-tool (func_emit_tests_Makefile_am): Also initialize
+	XFAIL_TESTS so it can be appended by modules.
+
 2009-11-15  Simon Josefsson  <simon@josefsson.org>
 
 	* lib/gc-pbkdf2-sha1.c: Remove comments from RFC 2898.  Reported

--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2277,6 +2277,7 @@
   #   "AM_GNU_GETTEXT used but SUBDIRS not defined"
   echo "SUBDIRS ="
   echo "TESTS ="
+  echo "XFAIL_TESTS ="
   echo "TESTS_ENVIRONMENT ="
   echo "noinst_PROGRAMS ="
   if ! $for_test; then

new file mode 100644
--- /dev/null
+++ b/modules/xalloc-die-tests
@@ -0,0 +1,9 @@
+Files:
+tests/test-xalloc-die.c
+
+Depends-on:
+
+Makefile.am:
+TESTS += test-xalloc-die
+XFAIL_TESTS += test-xalloc-die
+check_PROGRAMS += test-xalloc-die

new file mode 100644
--- /dev/null
+++ b/tests/test-xalloc-die.c
@@ -0,0 +1,28 @@
+/* Test of xalloc_die() function.
+   Copyright (C) 2009 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Simon Josefsson <simon@josefsson.org>, 2009.  */
+
+#include <config.h>
+
+#include "xalloc.h"
+
+int
+main (void)
+{
+  xalloc_die ();
+  return 0;
+}