diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 61857f57a2..97e0329c83 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,10 @@
+2015-04-10  Stefan Liebler  <stli@linux.vnet.ibm.com>
+
+	* tests-mbwc/dat_mbrlen.c (tst_mbrlen_loc): Change expected
+	result to -2 in case of n == 0.
+	* tests-mbwc/tst_mbrtowc.c (tst_mbrtowc): Check result against
+	-2 instead of 0.
+
 2015-03-04  Roland McGrath  <roland@hack.frob.com>
 
 	* bug-setlocale1.c (do_test): Remove argument handling and
diff --git a/localedata/tests-mbwc/dat_mbrlen.c b/localedata/tests-mbwc/dat_mbrlen.c
index 61e8423115..1df485e9c9 100644
--- a/localedata/tests-mbwc/dat_mbrlen.c
+++ b/localedata/tests-mbwc/dat_mbrlen.c
@@ -30,7 +30,7 @@ TST_MBRLEN tst_mbrlen_loc [] = {
 	},
 	{
 	  {
-	    { 0,		1,  0,		     },
+	    { 0,		1,  -2,		     },
 	    { 0,		1,  0,		     },
 	    { 0,		1,  1,		     },
 	  }
@@ -46,7 +46,7 @@ TST_MBRLEN tst_mbrlen_loc [] = {
 	},
 	{
 	  {
-	    { 0,		1,  0,		     },
+	    { 0,		1,  -2,		     },
 	    { 0,		1,  1,		     },
 	    { 0,		1,  1,		     },
 	  }
@@ -68,7 +68,7 @@ TST_MBRLEN tst_mbrlen_loc [] = {
 	},
 	{
 	  {
-	    { 0,		1,  0,		     },
+	    { 0,		1,  -2,		     },
 	    { 0,		1,  1,		     },
 	    { 0,		1,  1,		     },
 	  }
@@ -84,7 +84,7 @@ TST_MBRLEN tst_mbrlen_loc [] = {
 	},
 	{
 	  {
-	    { 0,		1,  0,		     },
+	    { 0,		1,  -2,		     },
 	    { EILSEQ,	1, -1,		     },
 	    { EILSEQ,	1, -1,		     },
 	  }
@@ -140,7 +140,7 @@ TST_MBRLEN tst_mbrlen_loc [] = {
 	},
 	{
 	  {
-	    { 0,		1,  0,		     },
+	    { 0,		1,  -2,		     },
 	    { 0,		1, -2,		     },
 	    { EILSEQ,	1, -1,		     },
 	  }
diff --git a/localedata/tests-mbwc/tst_mbrtowc.c b/localedata/tests-mbwc/tst_mbrtowc.c
index ffb33ce11e..20507abd99 100644
--- a/localedata/tests-mbwc/tst_mbrtowc.c
+++ b/localedata/tests-mbwc/tst_mbrtowc.c
@@ -26,7 +26,7 @@ tst_mbrtowc (FILE * fp, int debug_flg)
     TST_HEAD_LOCALE (mbrtowc, S_MBRTOWC);
     TST_DO_REC (mbrtowc)
     {
-      if (mbrtowc (NULL, "", 0, &t) != 0)
+      if (mbrtowc (NULL, "", 0, &t) != -2)
 	{
 	  err_count++;
 	  Result (C_FAILURE, S_MBRTOWC, CASE_3,