diff --git a/gcc/testsuite/g++.dg/diagnostic/ptrtomem1.C b/gcc/testsuite/g++.dg/diagnostic/ptrtomem1.C
index bb1327f7af1317bba1c7945492fa088167f79a09..9f9b77ae4035e9fa2a9455d6aedee397d96ca51b 100644
--- a/gcc/testsuite/g++.dg/diagnostic/ptrtomem1.C
+++ b/gcc/testsuite/g++.dg/diagnostic/ptrtomem1.C
@@ -19,7 +19,7 @@ void f2(T)
 { }
 
 template<typename T>
-requires (sizeof(T)==1) // dg-message {\[with T = int \(X::\*\)\[5\]\]} }
+requires (sizeof(T)==1) // { dg-message {\[with T = int \(X::\*\)\[5\]\]} }
 void f3(T)
 { }
 
diff --git a/gcc/testsuite/g++.dg/ipa/pr45572-2.C b/gcc/testsuite/g++.dg/ipa/pr45572-2.C
index 8b583d9c5d5cb24d4965350b9ffe8113d5356875..9bf49acb450e5671635facb3920b720b9285bbf8 100644
--- a/gcc/testsuite/g++.dg/ipa/pr45572-2.C
+++ b/gcc/testsuite/g++.dg/ipa/pr45572-2.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-finline-small-functions -findirect-inlining -finline-function+
+// { dg-options "-finline-small-functions -findirect-inlining -finline-functions -O" }
 typedef struct
 {} __mpf_struct;
 typedef __mpf_struct mpf_t[1];
diff --git a/gcc/testsuite/g++.dg/template/spec26.C b/gcc/testsuite/g++.dg/template/spec26.C
index 3d187071afe1d9c2051405db19415ebfbbb08b6a..fad8e3e151932285b4b3ba8a4dab8412cb8c8be2 100644
--- a/gcc/testsuite/g++.dg/template/spec26.C
+++ b/gcc/testsuite/g++.dg/template/spec26.C
@@ -1,4 +1,4 @@
-// dg-do run
+// { dg-do run }
 // Copyright (C) 2005 Free Software Foundation, Inc.
 // Contributed by Nathan Sidwell 16 Sep 2005 <nathan@codesourcery.com>
 
diff --git a/gcc/testsuite/gcc.dg/pr20126.c b/gcc/testsuite/gcc.dg/pr20126.c
index 257832ab18a5b2bca9d090b376b79617f6e6afb0..a421ce1758ddd265793784511dd809e873c0e8b4 100644
--- a/gcc/testsuite/gcc.dg/pr20126.c
+++ b/gcc/testsuite/gcc.dg/pr20126.c
@@ -1,5 +1,5 @@
-/* dg-do run */
-/* dg-options "-O2" */
+/* { dg-do run } */
+/* { dg-options "-O2" } */
 
 /* PR target/20126 was not really target-specific, but rather a loop's
    failure to take into account the possibility that a DEST_ADDR giv
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr20739.c b/gcc/testsuite/gcc.dg/tree-ssa/pr20739.c
index c1e7b58e38543532f4d200193dc1767f9a654dd7..d7fff14f953891933e7fe49353aa6a549ac39691 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr20739.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr20739.c
@@ -1,7 +1,7 @@
 /* PR middle-end/20739 */
 
-/* dg-do compile */
-/* dg-options "-O" */
+/* { dg-do compile } */
+/* { dg-options "-O" } */
 
 /* We used to fail to compile this because gimplification dropped the
    conversion that added the const qualifier to the sub-expression