diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7ee76957647..f213b482d9f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-23  Paolo Bonzini  <bonzini@gnu.org>
+
+	* gcc.target/i386/cmov3.c: Fix scan-assembler.
+	* gcc.target/i386/cmov4.c: Fix scan-assembler.
+	* gcc.target/i386/xchg-2.c: Fix scan-assembler.
+
 2007-08-22  Christopher D. Rickett  <crickett@lanl.gov>
 
 	PR fortran/33020
diff --git a/gcc/testsuite/gcc.target/i386/cmov3.c b/gcc/testsuite/gcc.target/i386/cmov3.c
index 30a5d1a0fa8..34df0aab7e4 100644
--- a/gcc/testsuite/gcc.target/i386/cmov3.c
+++ b/gcc/testsuite/gcc.target/i386/cmov3.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -march=k8" } */
-/* { dg-final { scan-assembler "cmov" } } */
+/* { dg-final { scan-assembler "cmov\[^3\]" } } */
 
 /* This conditional move is fastest to be done using cmov.  */
 t(int a, int b)
diff --git a/gcc/testsuite/gcc.target/i386/cmov4.c b/gcc/testsuite/gcc.target/i386/cmov4.c
index f25313812f1..6a955eaebfd 100644
--- a/gcc/testsuite/gcc.target/i386/cmov4.c
+++ b/gcc/testsuite/gcc.target/i386/cmov4.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -march=k8" } */
-/* { dg-final { scan-assembler "cmov" } } */
+/* { dg-final { scan-assembler "cmov\[^4\]" } } */
 
 /* Verify that if conversion happends for memory references.  */
 int ARCHnodes;
diff --git a/gcc/testsuite/gcc.target/i386/xchg-2.c b/gcc/testsuite/gcc.target/i386/xchg-2.c
index 0853d14c1e7..f00fb0f2115 100644
--- a/gcc/testsuite/gcc.target/i386/xchg-2.c
+++ b/gcc/testsuite/gcc.target/i386/xchg-2.c
@@ -6,4 +6,4 @@ unsigned short good(unsigned short a)
        return (a >> 8 | a << 8);
 }
 
-/* { dg-final { scan-assembler "xchg" } } */
+/* { dg-final { scan-assembler "xchgb" } } */