diff --git a/ChangeLog b/ChangeLog
index af0d2433f0..e7291a6fa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-17  Joseph Myers  <joseph@codesourcery.com>
+
+	* math/test-misc.c (main): Do not treat incorrectly rounded
+	conversions as failure unless ROUNDING_TESTS passes.
+
 2013-06-15  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #15631]
diff --git a/math/test-misc.c b/math/test-misc.c
index 94c7c1531f..390415ae23 100644
--- a/math/test-misc.c
+++ b/math/test-misc.c
@@ -1306,7 +1306,11 @@ main (void)
 	    {
 	      printf ("%La incorrectly rounded to %s as %a\n",
 		      ld5 * i, mstr, d5);
-	      result = 1;
+	      if (ROUNDING_TESTS (long double, mode)
+		  && ROUNDING_TESTS (double, mode))
+		result = 1;
+	      else
+		puts ("ignoring this failure");
 	    }
 	}
     }
@@ -1322,7 +1326,11 @@ main (void)
   if (d7 != nextafter (0.0, 1.0))
     {
       printf ("%La incorrectly rounded upward to %a\n", ld7, d7);
-      result = 1;
+      if (ROUNDING_TESTS (long double, FE_UPWARD)
+	  && ROUNDING_TESTS (double, FE_UPWARD))
+	result = 1;
+      else
+	puts ("ignoring this failure");
     }
 #endif