--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-03-25  Bruno Haible  <bruno@clisp.org>
 
+	Tests for module 'unictype/category-longname'.
+	* modules/unictype/category-longname-tests: New file.
+	* tests/unictype/test-categ_longname.c: New file.
+
 	New module 'unictype/category-longname'.
 	* lib/unictype.in.h (uc_general_category_long_name): New declaration.
 	* lib/unictype/categ_longname.c: New file.

new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-longname-tests
@@ -0,0 +1,16 @@
+Files:
+tests/unictype/test-categ_longname.c
+tests/macros.h
+
+Depends-on:
+unictype/category-or
+unictype/category-Z
+unictype/category-Nl
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_longname
+check_PROGRAMS += test-categ_longname
+test_categ_longname_SOURCES = unictype/test-categ_longname.c
+test_categ_longname_LDADD = $(LDADD) $(LIBUNISTRING)

new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_longname.c
@@ -0,0 +1,33 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007-2009, 2011 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/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <string.h>
+
+#include "macros.h"
+
+int
+main ()
+{
+  ASSERT (strcmp (uc_general_category_long_name (UC_CATEGORY_Z), "Separator") == 0);
+  ASSERT (strcmp (uc_general_category_long_name (UC_CATEGORY_Nl), "Letter Number") == 0);
+  ASSERT (uc_general_category_long_name (uc_general_category_or (UC_CATEGORY_Z, UC_CATEGORY_Nl)) == NULL);
+
+  return 0;
+}