diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 5d3e847c3b..538dd50248 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-17  Andreas Jaeger  <aj@suse.de>
+
+	* tests-mbwc/tst_funcs.h (TST_IF_RETURN): Only test errno if it
+	should have a value.
+
 2000-08-14  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/iso14651_t1: Rearrange cyrillic and greek sections to
diff --git a/localedata/tests-mbwc/tst_funcs.h b/localedata/tests-mbwc/tst_funcs.h
index e72154fa74..177ca09567 100644
--- a/localedata/tests-mbwc/tst_funcs.h
+++ b/localedata/tests-mbwc/tst_funcs.h
@@ -134,7 +134,9 @@ extern int result (FILE * fp, char res, const char *func, const char *loc,
 #define TST_IF_RETURN(_s_func_) \
   if (err_flg == 1)							      \
     {									      \
-      if (errno_save == err_exp)					      \
+      /* If no error occured, errno is undefined. Here we check only if       \
+         errno has the right value if it should have one.  */		      \
+      if ((err_exp == 0) || (errno_save == err_exp))			      \
 	{								      \
 	  result (fp, C_SUCCESS, _s_func_, locale, rec+1, seq_num+1, 1,	      \
 		  MS_PASSED);						      \