diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9e6773cb8fd..7b0e98ef03b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-02  Richard Sandiford  <richard@codesourcery.com>
+
+	* gcc.target/mips/mips.exp (setup_mips_tests): Treat -mfp* as
+	an ABI option.
+
 2007-07-02  Daniel Berlin  <dberlin@dberlin.org>
 
 	* gfortran.fortran-torture/compile/pr32583.f: New.
diff --git a/gcc/testsuite/gcc.target/mips/mips.exp b/gcc/testsuite/gcc.target/mips/mips.exp
index af5b0fbdd5d..6c3cf070867 100644
--- a/gcc/testsuite/gcc.target/mips/mips.exp
+++ b/gcc/testsuite/gcc.target/mips/mips.exp
@@ -79,7 +79,7 @@ proc setup_mips_tests {} {
     regexp {float = "([^"]*)} $output dummy mips_float
 
     set mips_forced_isa [regexp -- {(-mips|-march)} $compiler_flags]
-    set mips_forced_abi [regexp -- {(-mgp|-mabi)} $compiler_flags]
+    set mips_forced_abi [regexp -- {(-mgp|-mfp|-mabi)} $compiler_flags]
     set mips_forced_float [regexp -- {-m(hard|soft)-float} $compiler_flags]
 }