diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1492bd6c94c..eecc6bedee7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-30  Michael Eager  <eager@eagercon.com>
+
+	* gcc.c-torture/execute/cmpsf-1.c: Rename FLOAT_{MIN,MAX} to
+	__FLT_{MIN,MAX}__.
+	
 2010-09-30  Sebastian Pop  <sebastian.pop@amd.com>
 
 	PR middle-end/45758
diff --git a/gcc/testsuite/gcc.c-torture/execute/cmpsf-1.c b/gcc/testsuite/gcc.c-torture/execute/cmpsf-1.c
index f5438a171d2..94bfd71a2de 100644
--- a/gcc/testsuite/gcc.c-torture/execute/cmpsf-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/cmpsf-1.c
@@ -56,8 +56,8 @@ float args[] =
   0.0F,
   1.0F,
   -1.0F, 
-  FLOAT_MAX,
-  FLOAT_MIN,
+  __FLT_MAX__,
+  __FLT_MIN__,
   0.0000000000001F,
   123456789.0F,
   -987654321.0F
@@ -155,14 +155,6 @@ main (void)
 	    abort ();
 	  if (fle (arg0, arg1) != *res++)
 	    abort ();
-	  if (fltu (arg0, arg1) != *res++)
-	    abort ();
-	  if (fgeu (arg0, arg1) != *res++)
-	    abort ();
-	  if (fgtu (arg0, arg1) != *res++)
-	    abort ();
-	  if (fleu (arg0, arg1) != *res++)
-	    abort ();
 	}
     }
   exit (0);