diff --git a/tools/regression/lib/libc/locale/Makefile b/tools/regression/lib/libc/locale/Makefile
index fcff6b23788e..374610d184cf 100644
--- a/tools/regression/lib/libc/locale/Makefile
+++ b/tools/regression/lib/libc/locale/Makefile
@@ -2,7 +2,9 @@
 
 TESTS=	test-mbrtowc	\
 	test-wcrtomb	\
+	test-mbsnrtowcs	\
 	test-mbsrtowcs	\
+	test-wcsnrtombs	\
 	test-wcsrtombs	\
 	test-btowc	\
 	test-mbrlen	\
diff --git a/tools/regression/lib/libc/locale/test-mbsnrtowcs.c b/tools/regression/lib/libc/locale/test-mbsnrtowcs.c
new file mode 100644
index 000000000000..2f1b0272f74d
--- /dev/null
+++ b/tools/regression/lib/libc/locale/test-mbsnrtowcs.c
@@ -0,0 +1,192 @@
+/*-
+ * Copyright (c) 2002-2004 Tim J. Robbins
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Test program for mbsnrtowcs().
+ *
+ * The function is tested with both the "C" ("POSIX") LC_CTYPE setting and
+ * "ja_JP.eucJP". Other encodings are not tested.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <assert.h>
+#include <errno.h>
+#include <limits.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+
+int
+main(int argc, char *argv[])
+{
+	char srcbuf[128];
+	wchar_t dstbuf[128];
+	char *src;
+	mbstate_t s;
+
+	/*
+	 * C/POSIX locale.
+	 */
+
+	/* Simple null terminated string. */
+	memset(srcbuf, 0xcc, sizeof(srcbuf));
+	strcpy(srcbuf, "hello");
+	wmemset(dstbuf, 0xcccc, sizeof(dstbuf) / sizeof(*dstbuf));
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	assert(mbsnrtowcs(dstbuf, (const char **)&src, 6, sizeof(dstbuf) /
+	    sizeof(*dstbuf), &s) == 5);
+	assert(wcscmp(dstbuf, L"hello") == 0);
+	assert(dstbuf[6] == 0xcccc);
+	assert(src == NULL);
+
+	/* Simple null terminated string, stopping early. */
+	memset(srcbuf, 0xcc, sizeof(srcbuf));
+	strcpy(srcbuf, "hello");
+	wmemset(dstbuf, 0xcccc, sizeof(dstbuf) / sizeof(*dstbuf));
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	assert(mbsnrtowcs(dstbuf, (const char **)&src, 4, sizeof(dstbuf) /
+	    sizeof(*dstbuf), &s) == 4);
+	assert(wmemcmp(dstbuf, L"hell", 4) == 0);
+	assert(dstbuf[5] == 0xcccc);
+	assert(src == srcbuf + 4);
+
+	/* Not enough space in destination buffer. */
+	memset(srcbuf, 0xcc, sizeof(srcbuf));
+	strcpy(srcbuf, "hello");
+	wmemset(dstbuf, 0xcccc, sizeof(dstbuf) / sizeof(*dstbuf));
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	assert(mbsnrtowcs(dstbuf, (const char **)&src, 6, 4, &s) == 4);
+	assert(wmemcmp(dstbuf, L"hell", 4) == 0);
+	assert(dstbuf[5] == 0xcccc);
+	assert(src == srcbuf + 4);
+
+	/* Null terminated string, internal dest. buffer */
+	memset(srcbuf, 0xcc, sizeof(srcbuf));
+	strcpy(srcbuf, "hello");
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	assert(mbsnrtowcs(NULL, (const char **)&src, 6, 0, &s) == 5);
+
+	/* Null terminated string, internal dest. buffer, stopping early */
+	memset(srcbuf, 0xcc, sizeof(srcbuf));
+	strcpy(srcbuf, "hello");
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	assert(mbsnrtowcs(NULL, (const char **)&src, 4, 0, &s) == 4);
+
+	/* Null terminated string, internal state. */
+	memset(srcbuf, 0xcc, sizeof(srcbuf));
+	strcpy(srcbuf, "hello");
+	wmemset(dstbuf, 0xcccc, sizeof(dstbuf) / sizeof(*dstbuf));
+	src = srcbuf;
+	assert(mbsnrtowcs(dstbuf, (const char **)&src, 6, sizeof(dstbuf) /
+	    sizeof(*dstbuf), NULL) == 5);
+	assert(wcscmp(dstbuf, L"hello") == 0);
+	assert(dstbuf[6] == 0xcccc);
+	assert(src == NULL);
+
+	/* Null terminated string, internal state, internal dest. buffer. */
+	memset(srcbuf, 0xcc, sizeof(srcbuf));
+	strcpy(srcbuf, "hello");
+	src = srcbuf;
+	assert(mbsnrtowcs(NULL, (const char **)&src, 6, 0, NULL) == 5);
+
+	/* Empty source buffer. */
+	memset(srcbuf, 0xcc, sizeof(srcbuf));
+	srcbuf[0] = '\0';
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	wmemset(dstbuf, 0xcccc, sizeof(dstbuf) / sizeof(*dstbuf));
+	assert(mbsnrtowcs(dstbuf, (const char **)&src, 1, 1, &s) == 0);
+	assert(dstbuf[0] == 0);
+	assert(dstbuf[1] == 0xcccc);
+	assert(src == NULL);
+
+	/* Zero length destination buffer. */
+	memset(srcbuf, 0xcc, sizeof(srcbuf));
+	strcpy(srcbuf, "hello");
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	wmemset(dstbuf, 0xcccc, sizeof(dstbuf) / sizeof(*dstbuf));
+	assert(mbsnrtowcs(dstbuf, (const char **)&src, 1, 0, &s) == 0);
+	assert(dstbuf[0] == 0xcccc);
+	assert(src == srcbuf);
+
+	/* Zero length source buffer. */
+	memset(srcbuf, 0xcc, sizeof(srcbuf));
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	wmemset(dstbuf, 0xcccc, sizeof(dstbuf) / sizeof(*dstbuf));
+	assert(mbsnrtowcs(dstbuf, (const char **)&src, 0, 1, &s) == 0);
+	assert(dstbuf[0] == 0xcccc);
+	assert(src == srcbuf);
+
+	/*
+	 * Japanese (EUC) locale.
+	 */
+
+	assert(strcmp(setlocale(LC_CTYPE, "ja_JP.eucJP"), "ja_JP.eucJP") == 0);
+	assert(MB_CUR_MAX > 1);
+
+	memset(srcbuf, 0xcc, sizeof(srcbuf));
+	strcpy(srcbuf, "\xA3\xC1 B \xA3\xC3");
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	wmemset(dstbuf, 0xcccc, sizeof(dstbuf) / sizeof(*dstbuf));
+	assert(mbsnrtowcs(dstbuf, (const char **)&src, 8, sizeof(dstbuf) /
+	    sizeof(*dstbuf), &s) == 5);
+	assert(dstbuf[0] == 0xA3C1 && dstbuf[1] == 0x20 && dstbuf[2] == 0x42 &&
+	    dstbuf[3] == 0x20 && dstbuf[4] == 0xA3C3 && dstbuf[5] == 0);
+	assert(src == NULL);
+
+	/* Partial character. */
+	memset(srcbuf, 0xcc, sizeof(srcbuf));
+	strcpy(srcbuf, "\xA3\xC1 B \xA3\xC3");
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	wmemset(dstbuf, 0xcccc, sizeof(dstbuf) / sizeof(*dstbuf));
+	assert(mbsnrtowcs(dstbuf, (const char **)&src, 6, sizeof(dstbuf) /
+	    sizeof(*dstbuf), &s) == 4);
+	assert(src == srcbuf + 6);
+	assert(!mbsinit(&s));
+	assert(mbsnrtowcs(dstbuf, (const char **)&src, 1, sizeof(dstbuf) /
+	    sizeof(*dstbuf), &s) == 1);
+	assert(src == srcbuf + 7);
+	assert(mbsnrtowcs(dstbuf, (const char **)&src, 1, sizeof(dstbuf) /
+	    sizeof(*dstbuf), &s) == 0);
+	assert(src == NULL);
+
+	printf("PASS mbsnrtowcs()\n");
+
+	return (0);
+}
diff --git a/tools/regression/lib/libc/locale/test-wcsnrtombs.c b/tools/regression/lib/libc/locale/test-wcsnrtombs.c
new file mode 100644
index 000000000000..f84c04669bc7
--- /dev/null
+++ b/tools/regression/lib/libc/locale/test-wcsnrtombs.c
@@ -0,0 +1,192 @@
+/*-
+ * Copyright (c) 2002-2004 Tim J. Robbins
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Test program for wcsnrtombs().
+ *
+ * The function is tested with both the "C" ("POSIX") LC_CTYPE setting and
+ * "ja_JP.eucJP". Other encodings are not tested.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <assert.h>
+#include <errno.h>
+#include <limits.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+
+int
+main(int argc, char *argv[])
+{
+	wchar_t srcbuf[128];
+	char dstbuf[128];
+	wchar_t *src;
+	mbstate_t s;
+
+	/*
+	 * C/POSIX locale.
+	 */
+
+	/* Simple null terminated string. */
+	wmemset(srcbuf, 0xcc, sizeof(srcbuf) / sizeof(*srcbuf));
+	wcscpy(srcbuf, L"hello");
+	memset(dstbuf, 0xcc, sizeof(dstbuf));
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	assert(wcsnrtombs(dstbuf, (const wchar_t **)&src, 6, sizeof(dstbuf),
+	    &s) == 5);
+	assert(strcmp(dstbuf, "hello") == 0);
+	assert((unsigned char)dstbuf[6] == 0xcc);
+	assert(src == NULL);
+
+	/* Simple null terminated string, stopping early. */
+	wmemset(srcbuf, 0xcc, sizeof(srcbuf) / sizeof(*srcbuf));
+	wcscpy(srcbuf, L"hello");
+	memset(dstbuf, 0xcc, sizeof(dstbuf));
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	assert(wcsnrtombs(dstbuf, (const wchar_t **)&src, 4, sizeof(dstbuf),
+	    &s) == 4);
+	assert(memcmp(dstbuf, "hell", 4) == 0);
+	assert((unsigned char)dstbuf[5] == 0xcc);
+	assert(src == srcbuf + 4);
+
+	/* Not enough space in destination buffer. */
+	wmemset(srcbuf, 0xcc, sizeof(srcbuf) / sizeof(*srcbuf));
+	wcscpy(srcbuf, L"hello");
+	memset(dstbuf, 0xcc, sizeof(dstbuf));
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	assert(wcsnrtombs(dstbuf, (const wchar_t **)&src, 6, 4,
+	    &s) == 4);
+	assert(memcmp(dstbuf, "hell", 4) == 0);
+	assert((unsigned char)dstbuf[5] == 0xcc);
+	assert(src == srcbuf + 4);
+
+	/* Null terminated string, internal dest. buffer */
+	wmemset(srcbuf, 0xcc, sizeof(srcbuf) / sizeof(*srcbuf));
+	wcscpy(srcbuf, L"hello");
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	assert(wcsnrtombs(NULL, (const wchar_t **)&src, 6, sizeof(dstbuf),
+	    &s) == 5);
+
+	/* Null terminated string, internal dest. buffer, stopping early. */
+	wmemset(srcbuf, 0xcc, sizeof(srcbuf) / sizeof(*srcbuf));
+	wcscpy(srcbuf, L"hello");
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	assert(wcsnrtombs(NULL, (const wchar_t **)&src, 4, sizeof(dstbuf),
+	    &s) == 4);
+
+	/* Null terminated string, internal state. */
+	wmemset(srcbuf, 0xcc, sizeof(srcbuf) / sizeof(*srcbuf));
+	wcscpy(srcbuf, L"hello");
+	memset(dstbuf, 0xcc, sizeof(dstbuf));
+	src = srcbuf;
+	assert(wcsnrtombs(dstbuf, (const wchar_t **)&src, 6, sizeof(dstbuf),
+	    NULL) == 5);
+	assert(strcmp(dstbuf, "hello") == 0);
+	assert((unsigned char)dstbuf[6] == 0xcc);
+	assert(src == NULL);
+
+	/* Null terminated string, internal state, internal dest. buffer. */
+	wmemset(srcbuf, 0xcc, sizeof(srcbuf) / sizeof(*srcbuf));
+	wcscpy(srcbuf, L"hello");
+	src = srcbuf;
+	assert(wcsnrtombs(NULL, (const wchar_t **)&src, 6, 0, NULL) == 5);
+
+	/* Empty source buffer. */
+	wmemset(srcbuf, 0xcc, sizeof(srcbuf) / sizeof(*srcbuf));
+	srcbuf[0] = L'\0';
+	memset(dstbuf, 0xcc, sizeof(dstbuf));
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	assert(wcsnrtombs(dstbuf, (const wchar_t **)&src, 1, sizeof(dstbuf),
+	    &s) == 0);
+	assert(dstbuf[0] == L'\0');
+
+	/* Zero length destination buffer. */
+	wmemset(srcbuf, 0xcc, sizeof(srcbuf) / sizeof(*srcbuf));
+	wcscpy(srcbuf, L"hello");
+	memset(dstbuf, 0xcc, sizeof(dstbuf));
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	assert(wcsnrtombs(dstbuf, (const wchar_t **)&src, 6, 0, &s) == 0);
+	assert((unsigned char)dstbuf[0] == 0xcc);
+
+	/* Zero length source buffer. */
+	wmemset(srcbuf, 0xcc, sizeof(srcbuf) / sizeof(*srcbuf));
+	memset(dstbuf, 0xcc, sizeof(dstbuf));
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	assert(wcsnrtombs(dstbuf, (const wchar_t **)&src, 0, sizeof(dstbuf),
+	    &s) == 0);
+	assert((unsigned char)dstbuf[0] == 0xcc);
+	assert(src == srcbuf);
+
+	/*
+	 * Japanese (EUC) locale.
+	 */
+
+	assert(strcmp(setlocale(LC_CTYPE, "ja_JP.eucJP"), "ja_JP.eucJP") == 0);
+	assert(MB_CUR_MAX > 1);
+
+	wmemset(srcbuf, 0xcc, sizeof(srcbuf) / sizeof(*srcbuf));
+	srcbuf[0] = 0xA3C1;
+	srcbuf[1] = 0x0020;
+	srcbuf[2] = 0x0042;
+	srcbuf[3] = 0x0020;
+	srcbuf[4] = 0xA3C3;
+	srcbuf[5] = 0x0000;
+	memset(dstbuf, 0xcc, sizeof(dstbuf));
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	assert(wcsnrtombs(dstbuf, (const wchar_t **)&src, 6, sizeof(dstbuf),
+	    &s) == 7);
+	assert(strcmp(dstbuf, "\xA3\xC1 B \xA3\xC3") == 0);
+	assert((unsigned char)dstbuf[8] == 0xcc);
+	assert(src == NULL);
+
+	/* Stopping early. */
+	memset(dstbuf, 0xcc, sizeof(dstbuf));
+	src = srcbuf;
+	memset(&s, 0, sizeof(s));
+	assert(wcsnrtombs(dstbuf, (const wchar_t **)&src, 6, 6,
+	    &s) == 5);
+	assert(memcmp(dstbuf, "\xA3\xC1 B ", 5) == 0);
+	assert((unsigned char)dstbuf[5] == 0xcc);
+	assert(src == srcbuf + 4);
+
+	printf("PASS wcsnrtombs()\n");
+
+	return (0);
+}