diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5881d6593616..427be8d123a3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,12 @@
 2008-05-20  Janis Johnson  <janis187@us.ibm.com>
 
+	* obj-c++.dg/try-catch-2.mm: Move dg-options after dg-xfail-if.
+	* obj-c++.dg/encode-8.mm: Move dg-options after dg-do.
+	* obj-c++.dg/bitfield-4.mm: Ditto; use dg-prune-output instead of
+	dg-excess-errors for possible additional message.
+	* obj-c++.dg/layout-1.mm: Use dg-prune-output instead of
+	dg-excess-errors for possible additional message.
+
 	* g++.dg/ext/vector14.C: Ignore a possible warning.
 
 2008-05-20  Samuel Tardieu  <sam@rfc1149.net>
diff --git a/gcc/testsuite/obj-c++.dg/bitfield-4.mm b/gcc/testsuite/obj-c++.dg/bitfield-4.mm
index 0344dcdfab61..72c1396d7068 100644
--- a/gcc/testsuite/obj-c++.dg/bitfield-4.mm
+++ b/gcc/testsuite/obj-c++.dg/bitfield-4.mm
@@ -1,8 +1,8 @@
 /* Check if the @defs() construct preserves the correct
    layout of bitfields.  */
 /* Contributed by Ziemowit Laski <zlaski@apple.com>.  */
-/* { dg-options "-lobjc -Wpadded" } */
 /* { dg-do run } */
+/* { dg-options "-lobjc -Wpadded" } */
 
 #include <objc/Object.h>
 
@@ -49,7 +49,7 @@ int main(void)
   return 0;
 }
 
-/* { dg-excess-errors "In file included from" { target lp64 } } */
+/* { dg-prune-output "In file included from" }  Ignore this message.  */
 /* { dg-bogus "padding struct to align" "PR23610" { xfail lp64 } 1 } */
 
 /* { dg-bogus "padding struct size" "PR23610" { xfail lp64 } 28 } */
diff --git a/gcc/testsuite/obj-c++.dg/encode-8.mm b/gcc/testsuite/obj-c++.dg/encode-8.mm
index bfd34754ff47..53ad4e3222c2 100644
--- a/gcc/testsuite/obj-c++.dg/encode-8.mm
+++ b/gcc/testsuite/obj-c++.dg/encode-8.mm
@@ -2,8 +2,8 @@
    'BOOL *' (which should be encoded as '^c') and 'char *' (which
    should be encoded as '*').  */
 /* Contributed by Ziemowit Laski <zlaski@apple.com>.  */
-/* { dg-options "-lobjc" } */
 /* { dg-do run { xfail { "*-*-*" } } } PR27249 */
+/* { dg-options "-lobjc" } */
 
 #include <string.h>           
 #include <stdlib.h>
diff --git a/gcc/testsuite/obj-c++.dg/layout-1.mm b/gcc/testsuite/obj-c++.dg/layout-1.mm
index 246dcc329b26..35ffa49da3b7 100644
--- a/gcc/testsuite/obj-c++.dg/layout-1.mm
+++ b/gcc/testsuite/obj-c++.dg/layout-1.mm
@@ -13,5 +13,5 @@
 - (id) foo;
 @end
 
-/* { dg-excess-errors "In file included from" { target lp64 } } */
+/* { dg-prune-output "In output included from" }   Ignore this message.  */
 /* { dg-bogus "padding struct to align" "PR23610" { xfail lp64 } 1 } */
diff --git a/gcc/testsuite/obj-c++.dg/try-catch-2.mm b/gcc/testsuite/obj-c++.dg/try-catch-2.mm
index 7809b890db91..d7b386a1bfad 100644
--- a/gcc/testsuite/obj-c++.dg/try-catch-2.mm
+++ b/gcc/testsuite/obj-c++.dg/try-catch-2.mm
@@ -2,9 +2,9 @@
    all uncaught exceptions.  */
 /* Developed by Ziemowit Laski <zlaski@apple.com>.  */
 
-/* { dg-options "-fobjc-exceptions" } */
-/* { dg-xfail-if "PR23616" { "*-*-*" } { "*" } { "" } } */
 /* { dg-do run } */
+/* { dg-xfail-if "PR23616" { "*-*-*" } { "*" } { "" } } */
+/* { dg-options "-fobjc-exceptions" } */
 
 #include <objc/Object.h>
 #include <stdio.h>