diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8390c4b67fe..c960251b4a9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2007-08-30  Uros Bizjak  <ubizjak@gmail.com>
+
+	* lib/gcc-dg.exp (cleanup-profile-file): New procedure.
+	* gcc.dg/20021014-1.c: Use cleanup-profile-file.
+	* gcc.dg/gcc.dg/20021014-1.c: Ditto.
+	* gcc.dg/pr32450.c: Ditto.
+	* gcc.dg/nest.c: Ditto.
+	* gcc.dg/nested-func-4.c: Ditto.
+	* g++.old-deja/g++.law/profile1.C: Ditto.
+
 2007-08-29  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
 	PR fortran/32989
diff --git a/gcc/testsuite/g++.old-deja/g++.law/profile1.C b/gcc/testsuite/g++.old-deja/g++.law/profile1.C
index 7f17a15de9f..ecd3b834c76 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/profile1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/profile1.C
@@ -8,3 +8,5 @@ main()
 {
   printf ("PASS\n");
 }
+
+/* { dg-final { cleanup-profile-file } } */
diff --git a/gcc/testsuite/gcc.dg/20021014-1.c b/gcc/testsuite/gcc.dg/20021014-1.c
index dd8614c9f09..41aa3c37620 100644
--- a/gcc/testsuite/gcc.dg/20021014-1.c
+++ b/gcc/testsuite/gcc.dg/20021014-1.c
@@ -23,3 +23,5 @@ int main (void)
     abort ();
   exit (0);
 }
+
+/* { dg-final { cleanup-profile-file } } */
diff --git a/gcc/testsuite/gcc.dg/nest.c b/gcc/testsuite/gcc.dg/nest.c
index 7178bd82045..5734c11f1a3 100644
--- a/gcc/testsuite/gcc.dg/nest.c
+++ b/gcc/testsuite/gcc.dg/nest.c
@@ -24,3 +24,5 @@ int main (void)
     abort ();
   return 0;
 }
+
+/* { dg-final { cleanup-profile-file } } */
diff --git a/gcc/testsuite/gcc.dg/nested-func-4.c b/gcc/testsuite/gcc.dg/nested-func-4.c
index 30826d885a6..36a8c405ce2 100644
--- a/gcc/testsuite/gcc.dg/nested-func-4.c
+++ b/gcc/testsuite/gcc.dg/nested-func-4.c
@@ -21,3 +21,5 @@ int main(void)
   foo (2);
   return 0;
 }
+
+/* { dg-final { cleanup-profile-file } } */
diff --git a/gcc/testsuite/gcc.dg/pr32450.c b/gcc/testsuite/gcc.dg/pr32450.c
index 4a1842e9b84..9606e3021ea 100644
--- a/gcc/testsuite/gcc.dg/pr32450.c
+++ b/gcc/testsuite/gcc.dg/pr32450.c
@@ -32,3 +32,5 @@ int main ()
   add ();
   return stack_pointer - 1;
 }
+
+/* { dg-final { cleanup-profile-file } } */
diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index 60017aa94e4..a40a99bb0c6 100644
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -352,6 +352,12 @@ proc remove-build-file { pat } {
     }
 }
 
+# Remove runtime-generated profile file for the current test.
+proc cleanup-profile-file { } {
+    remove-build-file "mon.out"
+    remove-build-file "gmon.out"
+}
+
 # Remove compiler-generated coverage files for the current test.
 proc cleanup-coverage-files { } {
     # This assumes that we are two frames down from dg-test or some other proc