Index: gcc.dg/tree-ssa/slsr-30.c
===================================================================
--- gcc.dg/tree-ssa/slsr-30.c	(revision 192137)
+++ gcc.dg/tree-ssa/slsr-30.c	(working copy)
@@ -21,4 +21,4 @@ f (int s, long c)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 3 "dom2" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
+/* { dg-final { cleanup-tree-dump "dom2" } } */
Index: gcc.dg/tree-ssa/attr-hotcold-2.c
===================================================================
--- gcc.dg/tree-ssa/attr-hotcold-2.c	(revision 192137)
+++ gcc.dg/tree-ssa/attr-hotcold-2.c	(working copy)
@@ -25,4 +25,4 @@ void f(int x, int y)
    the testcase around too much.  */
 /* { dg-final { scan-ipa-dump-times "block 5, loop depth 0, count 0, freq \[6-9\]\[0-9\]\[0-9\]\[0-9\]" 1 "profile_estimate" } } */
 
-/* { dg-final { cleanup-tree-dump "profile_estimate" } } */
+/* { dg-final { cleanup-ipa-dump "profile_estimate" } } */
Index: gcc.dg/tree-ssa/ldist-21.c
===================================================================
--- gcc.dg/tree-ssa/ldist-21.c	(revision 192137)
+++ gcc.dg/tree-ssa/ldist-21.c	(working copy)
@@ -9,3 +9,4 @@ void bar(char *p, int n)
 }
 
 /* { dg-final { scan-tree-dump "generated memmove" "ldist" } } */
+/* { dg-final { cleanup-tree-dump "ldist" } } */