diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3700cb1fdde..a645d92a0e4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-16  Andrew Pinski  <andrew_pinski@playstation.sony.com>
+
+	* gcc.target/spu/intrinsics-1.c: Use dg-message to
+	match flax-vector-conversions note.
+	* gcc.target/spu/fixed-range-bad.c: Use dg-warning
+	instead of dg-error for the warning.
+
 2007-07-16  Rask Ingemann Lambertsen  <rask@sygehus.dk>
 
 	* gcc.c-torture/execute/20061101-2.c: Variant of 20061101-1.c
diff --git a/gcc/testsuite/gcc.target/spu/fixed-range-bad.c b/gcc/testsuite/gcc.target/spu/fixed-range-bad.c
index eeef122cbff..099328378c7 100644
--- a/gcc/testsuite/gcc.target/spu/fixed-range-bad.c
+++ b/gcc/testsuite/gcc.target/spu/fixed-range-bad.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-mfixed-range=1-x" } */
-/* { dg-error "unknown register name" "" { target spu-*-* } 0 } */
+/* { dg-warning "unknown register name" "" { target spu-*-* } 0 } */
 
 int i;
diff --git a/gcc/testsuite/gcc.target/spu/intrinsics-1.c b/gcc/testsuite/gcc.target/spu/intrinsics-1.c
index 7f645753fdc..7a7a3a9e444 100644
--- a/gcc/testsuite/gcc.target/spu/intrinsics-1.c
+++ b/gcc/testsuite/gcc.target/spu/intrinsics-1.c
@@ -13,5 +13,6 @@ void f(void)
   gt = spu_cmpgt(a, a1); /* { dg-error "integer from pointer without a cast" } */
   gt = spu_cmpgt(a, b); /* { dg-error "parameter list" } */
   gt = spu_cmpgt(a, a);
-  a = spu_cmpgt(a, a); /* { dg-error "" } */
+  a = spu_cmpgt(a, a); /* { dg-message "note: use -flax-vector-conversions to permit conversions between vectors with differing element types or numbers of subparts" } */ 
+/* { dg-error "incompatible types in" "" { target *-*-* } 16 } */
 }