diff --git a/ChangeLog b/ChangeLog
index 982c98c7db..b8a0521612 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2013-03-15  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* math/test-misc.c (main): Fix copy'n'pastos.
+	* misc/tst-efgcvt.c (special): Likewise.
+
 	* stdio-common/printf_fp.c (__isinfl_internal, __isnanl_internal):
 	Remove declarations.
 
diff --git a/math/test-misc.c b/math/test-misc.c
index d64e8e2fcc..a4e70d6668 100644
--- a/math/test-misc.c
+++ b/math/test-misc.c
@@ -1116,7 +1116,7 @@ main (void)
       }
     else if (fetestexcept (FE_UNDERFLOW))
       {
-	puts ("scalbl(NaN, 0) raises underflow exception");
+	puts ("scalbl (LDBL_MIN, 2147483647) raises underflow exception");
 	result = 1;
       }
 
@@ -1134,7 +1134,7 @@ main (void)
       }
     else if (fetestexcept (FE_OVERFLOW))
       {
-	puts ("scalbl(NaN, 0) raises overflow exception");
+	puts ("scalbl (LDBL_MAX, -2147483647) raises overflow exception");
 	result = 1;
       }
   }
diff --git a/misc/tst-efgcvt.c b/misc/tst-efgcvt.c
index 87d8c630ac..c9896492fc 100644
--- a/misc/tst-efgcvt.c
+++ b/misc/tst-efgcvt.c
@@ -177,7 +177,7 @@ special (void)
 
   p = ecvt (INFINITY, 10, &decpt, &sign);
   if (sign != 0 || strcmp (p, "inf") != 0)
-    output_error ("ecvt", NAN, 10, "inf", 0, 0, p, decpt, sign);
+    output_error ("ecvt", INFINITY, 10, "inf", 0, 0, p, decpt, sign);
 
   /* Simply make sure these calls with large NDIGITs don't crash.  */
   (void) ecvt (123.456, 10000, &decpt, &sign);