--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-14  Eric Blake  <ebb9@byu.net>
+
+	Test xmemdup0.
+	* modules/xmemdup0-tests: New file.
+	* tests/test-xmemdup0.c: Likewise.
+
 2008-05-13  Eric Blake  <ebb9@byu.net>
 
 	Split xmemdup0 into its own module.

new file mode 100644
--- /dev/null
+++ b/modules/xmemdup0-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-xmemdup0.c
+
+Depends-on:
+progname
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-xmemdup0
+check_PROGRAMS += test-xmemdup0
+test_xmemdup0_LDADD = $(LDADD) @LIBINTL@

new file mode 100644
--- /dev/null
+++ b/tests/test-xmemdup0.c
@@ -0,0 +1,90 @@
+/* Test of xmemdup0() function.
+   Copyright (C) 2008 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, 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, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Eric Blake <ebb9@byu.net>, 2008.  */
+
+#include <config.h>
+
+#include "xmemdup0.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          fflush (stderr);						     \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main (int argc, char **argv)
+{
+  char buffer[10] = { 'a', 'b', 'c', 'd', '\0',
+		      'f', 'g', 'h', 'i', 'j'   };
+
+  /* Empty string.  */
+  {
+    char *result = xmemdup0 (NULL, 0);
+    ASSERT (result);
+    ASSERT (!*result);
+    free (result);
+  }
+  {
+    char *result = xmemdup0 ("", 0);
+    ASSERT (result);
+    ASSERT (!*result);
+    free (result);
+  }
+
+  /* Various buffer lengths.  */
+  {
+    char *result = xmemdup0 (buffer, 4);
+    ASSERT (result);
+    ASSERT (strcmp (result, buffer) == 0);
+    free (result);
+  }
+  {
+    char *result = xmemdup0 (buffer, 5);
+    ASSERT (result);
+    ASSERT (strcmp (result, buffer) == 0);
+    ASSERT (result[5] == '\0');
+    free (result);
+  }
+  {
+    char *result = xmemdup0 (buffer, 9);
+    ASSERT (result);
+    ASSERT (memcmp (result, buffer, 9) == 0);
+    ASSERT (result[9] == '\0');
+    free (result);
+  }
+  {
+    char *result = xmemdup0 (buffer, 10);
+    ASSERT (result);
+    ASSERT (memcmp (result, buffer, 10) == 0);
+    ASSERT (result[10] == '\0');
+    free (result);
+  }
+
+  return 0;
+}