--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-05-10  Bruno Haible  <bruno@clisp.org>
 
+	* modules/unilbrk/u16-width-linebreaks-tests: New file.
+	* tests/unilbrk/test-u16-width-linebreaks.c: New file.
+
 	* modules/unilbrk/u8-width-linebreaks-tests: New file.
 	* tests/unilbrk/test-u8-width-linebreaks.c: New file.
 

new file mode 100644
--- /dev/null
+++ b/modules/unilbrk/u16-width-linebreaks-tests
@@ -0,0 +1,12 @@
+Files:
+tests/unilbrk/test-u16-width-linebreaks.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-u16-width-linebreaks
+check_PROGRAMS += test-u16-width-linebreaks
+test_u16_width_linebreaks_SOURCES = unilbrk/test-u16-width-linebreaks.c
+

new file mode 100644
--- /dev/null
+++ b/tests/unilbrk/test-u16-width-linebreaks.c
@@ -0,0 +1,86 @@
+/* Test of line breaking of UTF-16 strings.
+   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 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 Bruno Haible <bruno@clisp.org>, 2008.  */
+
+#include <config.h>
+
+#include "unilbrk.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          fflush (stderr);						     \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  /* Test case n = 0.  */
+  u16_width_linebreaks (NULL, 0, 80, 0, 0, NULL, "GB18030", NULL);
+
+  {
+    static const uint16_t input[61] =
+      /* "Grüß Gott. Здравствуйте! x=(-b±sqrt(b²-4ac))/(2a)  日本語,中文,한글" */
+      { 'G', 'r', 0x00FC, 0x00DF, ' ', 'G', 'o', 't', 't', '.', ' ',
+	0x0417, 0x0434, 0x0440, 0x0430, 0x0432, 0x0441, 0x0442, 0x0432, 0x0443,
+	0x0439, 0x0442, 0x0435, '!', ' ',
+	'x', '=', '(', '-', 'b', 0x00B1, 's', 'q', 'r', 't', '(', 'b', 0x00B2,
+	'-', '4', 'a', 'c', ')', ')', '/', '(', '2', 'a', ')', ' ', ' ',
+	0x65E5, 0x672C, 0x8A9E, ',', 0x4E2D, 0x6587, ',', 0xD55C, 0xAE00, '\n'
+      };
+
+    {
+      char *p = (char *) malloc (SIZEOF (input));
+      size_t i;
+
+      u16_width_linebreaks (input, SIZEOF (input), 25, 0, 0, NULL, "GB18030", p);
+      for (i = 0; i < 61; i++)
+	{
+	  ASSERT (p[i] == (i == 60 ? UC_BREAK_MANDATORY :
+			   i == 25 || i == 45 ? UC_BREAK_POSSIBLE :
+			   UC_BREAK_PROHIBITED));
+	}
+      free (p);
+    }
+
+    {
+      char *p = (char *) malloc (SIZEOF (input));
+      size_t i;
+
+      u16_width_linebreaks (input, SIZEOF (input), 25, 0, 0, NULL, "GB2312", p);
+      for (i = 0; i < 61; i++)
+	{
+	  ASSERT (p[i] == (i == 60 ? UC_BREAK_MANDATORY :
+			   i == 17 || i == 35 || i == 55 ? UC_BREAK_POSSIBLE :
+			   UC_BREAK_PROHIBITED));
+	}
+      free (p);
+    }
+  }
+
+  return 0;
+}