diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7e989b8a35e..5608be04434 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,23 @@
+2007-02-09  Uros Bizjak  <ubizjak@gmail.com>
+
+	* gcc.dg/pr26570.c: Clean up coverage files.
+	* gcc.dg/pr30172-1.c: Clean up gimple tree dump.
+	* gcc.dg/lower-subreg-1.c: Clean up subreg rtl dump file.
+	* gcc.dg/tree-ssa/tailrecursion-1.c: Clean up all tailr dump files.
+	* gcc.dg/tree-ssa/tailrecursion-2.c: Ditto.
+	* gcc.dg/tree-ssa/tailrecursion-3.c: Ditto.
+	* gcc.dg/tree-ssa/tailrecursion-4.c: Ditto.
+	* gcc.dg/tree-ssa/pr21658.c: Clean up all ccp dump files.
+	* gcc.dg/tree-ssa/pr21829.c: Clean up all phicprop dump files.
+	* gcc.dg/tree-ssa/pr15349.c: Clean up all mergephi dump files.
+	* gcc.dg/tree-ssa/pr25501.c: Ditto.
+	* gcc.dg/fold-compare-2.c: Clean up vrp dump files.
+	* gcc.dg/vect/vect-recip.c: Clean up vect dump file.
+	* gcc.dg/vect/pr28952.c: Ditto.
+	* gcc.dg/vect/pr27151.c: Ditto.
+	* gcc.dg/gomp/macro-3.c: Clean up omplower dump file.
+	* g++.dg/gomp/macro-3.C: Ditto.
+
 2007-02-08  Uros Bizjak  <ubizjak@gmail.com>
 
 	* gcc.dg/vect/vect-strided-same-dr.c (main): Fix terminate condition
diff --git a/gcc/testsuite/g++.dg/gomp/macro-3.C b/gcc/testsuite/g++.dg/gomp/macro-3.C
index 32623fde58e..3606db566f1 100644
--- a/gcc/testsuite/g++.dg/gomp/macro-3.C
+++ b/gcc/testsuite/g++.dg/gomp/macro-3.C
@@ -23,3 +23,4 @@ foo (void)
 }
 
 // { dg-final { scan-tree-dump-times "#pragma omp parallel" 4 "omplower" } }
+// { dg-final { cleanup-tree-dump "omplower" } }
diff --git a/gcc/testsuite/gcc.dg/fold-compare-2.c b/gcc/testsuite/gcc.dg/fold-compare-2.c
index 79bade7b9e1..bcdb7ad3fcb 100644
--- a/gcc/testsuite/gcc.dg/fold-compare-2.c
+++ b/gcc/testsuite/gcc.dg/fold-compare-2.c
@@ -16,3 +16,5 @@ main(void)
 }
 
 /* { dg-final { scan-tree-dump-times "Removing basic block" 1 "vrp1" } } */
+/* { dg-final { cleanup-tree-dump "vrp\[1-2\]" } } */
+
diff --git a/gcc/testsuite/gcc.dg/gomp/macro-3.c b/gcc/testsuite/gcc.dg/gomp/macro-3.c
index dc4fe091b31..233d2edcdc9 100644
--- a/gcc/testsuite/gcc.dg/gomp/macro-3.c
+++ b/gcc/testsuite/gcc.dg/gomp/macro-3.c
@@ -23,3 +23,4 @@ foo (void)
 }
 
 /* { dg-final { scan-tree-dump-times "#pragma omp parallel" 4 "omplower" } } */
+/* { dg-final { cleanup-tree-dump "omplower" } } */
diff --git a/gcc/testsuite/gcc.dg/lower-subreg-1.c b/gcc/testsuite/gcc.dg/lower-subreg-1.c
index d376c745414..f3a29f62c76 100644
--- a/gcc/testsuite/gcc.dg/lower-subreg-1.c
+++ b/gcc/testsuite/gcc.dg/lower-subreg-1.c
@@ -5,4 +5,4 @@
 long long test (long long a, long long b) { return a | b; }
 
 /* { dg-final { scan-rtl-dump "Splitting reg" "subreg" } } */
-/* { dg-final { cleanup-tree-dump "subreg" } } */
+/* { dg-final { cleanup-rtl-dump "subreg" } } */
diff --git a/gcc/testsuite/gcc.dg/pr26570.c b/gcc/testsuite/gcc.dg/pr26570.c
index 999b240e43b..efae8d6ee74 100644
--- a/gcc/testsuite/gcc.dg/pr26570.c
+++ b/gcc/testsuite/gcc.dg/pr26570.c
@@ -5,3 +5,5 @@ unsigned test (unsigned a, unsigned b)
 {
   return a / b;
 } /* { dg-warning "execution counts estimated" } */
+
+/* { dg-final { cleanup-coverage-files } } */
diff --git a/gcc/testsuite/gcc.dg/pr30172-1.c b/gcc/testsuite/gcc.dg/pr30172-1.c
index 4e029b5fba6..2388a091ce8 100644
--- a/gcc/testsuite/gcc.dg/pr30172-1.c
+++ b/gcc/testsuite/gcc.dg/pr30172-1.c
@@ -12,4 +12,4 @@ _Complex double test5 (double x, double y) { return (x + y * 1.i) * -1.i; }
 /* { dg-final { scan-tree-dump "COMPLEX_EXPR <x, y>" "gimple" } } */
 /* { dg-final { scan-tree-dump "D.* = -y;\n.*COMPLEX_EXPR <D.*, x>" "gimple" } } */
 /* { dg-final { scan-tree-dump "D.* = -x;\n.*COMPLEX_EXPR <y, D.*>" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
+/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr15349.c b/gcc/testsuite/gcc.dg/tree-ssa/pr15349.c
index 080aa81b504..9f15d727f03 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr15349.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr15349.c
@@ -23,4 +23,4 @@ foo (int a, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "PHI" 1 "mergephi2"} } */
-/* { dg-final { cleanup-tree-dump "mergephi2" } } */
+/* { dg-final { cleanup-tree-dump "mergephi\[1-2\]" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21658.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21658.c
index 16893b071f3..577e1795e74 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21658.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21658.c
@@ -18,4 +18,4 @@ f (void)
 }
 
 /* { dg-final { scan-tree-dump-times "Folded statement: if " 1 "ccp1"} } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
+/* { dg-final { cleanup-tree-dump "ccp\[1-2\]" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21829.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21829.c
index 4c723f3ff86..d0e8b133e82 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21829.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21829.c
@@ -17,5 +17,5 @@ int test(int v)
 }
 
 /* { dg-final { scan-tree-dump-times "Original statement:.*% 2\[ \t\n]*Updated statement.*=1" 0 "phicprop3" } } */
-/* { dg-final { cleanup-tree-dump "phicprop3" } } */
+/* { dg-final { cleanup-tree-dump "phicprop\[1-3\]" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr25501.c b/gcc/testsuite/gcc.dg/tree-ssa/pr25501.c
index 7fb2bcc8ac6..d63a5274e58 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr25501.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr25501.c
@@ -33,4 +33,4 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "Removing basic block" 0 "mergephi1"} } */
-/* { dg-final { cleanup-tree-dump "mergephi" } } */
+/* { dg-final { cleanup-tree-dump "mergephi\[1-2\]" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-1.c b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-1.c
index 64de788ec6d..ba9a0d65e11 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-1.c
@@ -9,4 +9,4 @@ t(int a)
 		return 0;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated tail recursion" 1 "tailr1"} } */
-/* { dg-final { cleanup-tree-dump "tailr1" } } */
+/* { dg-final { cleanup-tree-dump "tailr\[1-2\]" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-2.c b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-2.c
index 9ef4fdb6d2e..b5fee4d59ab 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-2.c
@@ -10,4 +10,4 @@ t(char *a)
 		return 0;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated tail recursion" 1 "tailr1"} } */
-/* { dg-final { cleanup-tree-dump "tailr1" } } */
+/* { dg-final { cleanup-tree-dump "tailr\[1-2\]" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-3.c b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-3.c
index 37b19af0e54..f14140355da 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-3.c
@@ -13,4 +13,4 @@ t(int a)
 	return r;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated tail recursion" 1 "tailr1"} } */
-/* { dg-final { cleanup-tree-dump "tailr1" } } */
+/* { dg-final { cleanup-tree-dump "tailr\[1-2\]" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-4.c b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-4.c
index 34689e64168..d89739f3aa8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-4.c
@@ -15,4 +15,4 @@ t(int a)
 	return r;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated tail recursion" 2 "tailr1"} } */
-/* { dg-final { cleanup-tree-dump "tailr1" } } */
+/* { dg-final { cleanup-tree-dump "tailr\[1-2\]" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr27151.c b/gcc/testsuite/gcc.dg/vect/pr27151.c
index 8b53b29b672..81f89b1a7e4 100644
--- a/gcc/testsuite/gcc.dg/vect/pr27151.c
+++ b/gcc/testsuite/gcc.dg/vect/pr27151.c
@@ -12,3 +12,5 @@ void vis_clear_data ()
       vs_data[i] = (vis_type == 1);
     }
 }
+
+/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr28952.c b/gcc/testsuite/gcc.dg/vect/pr28952.c
index c5ef65cb21f..7305e607cfb 100644
--- a/gcc/testsuite/gcc.dg/vect/pr28952.c
+++ b/gcc/testsuite/gcc.dg/vect/pr28952.c
@@ -28,4 +28,4 @@ send_spaceship_info (void)
   lsend_packet_spaceship_info (&info);
 }
 
-
+/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-recip.c b/gcc/testsuite/gcc.dg/vect/vect-recip.c
index 89af9843fef..4f130b05c0e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-recip.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-recip.c
@@ -16,3 +16,5 @@ void f(float *__restrict__ qa, float *__restrict__ qb,
     qcm[i] = qc[i]/a;
   }
 }
+
+/* { dg-final { cleanup-tree-dump "vect" } } */