diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 49e7ea2769f..f65519fb3ce 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-01  Mark Mitchell  <mark@codesourcery.com>
+
+	* g++.dg/tls/init-2.C: Tweak error messages.
+
 2002-10-01  Richard Sandiford  <rsandifo@redhat.com>
 
 	* gcc.c-torture/compile/20020923-1.c: New test.
diff --git a/gcc/testsuite/g++.dg/tls/init-2.C b/gcc/testsuite/g++.dg/tls/init-2.C
index 49df50147b3..0fff6f6ab1e 100644
--- a/gcc/testsuite/g++.dg/tls/init-2.C
+++ b/gcc/testsuite/g++.dg/tls/init-2.C
@@ -1,13 +1,13 @@
 /* Invalid initializations.  */
 
 extern __thread int i;
-__thread int *p = &i;	/* { dg-error "run-time initialization" } */
+__thread int *p = &i;	/* { dg-error "dynamically initialized" } */
 
 extern int f();
-__thread int j = f();	/* { dg-error "run-time initialization" } */
+__thread int j = f();	/* { dg-error "dynamically initialized" } */
 
 struct S
 {
   S();
 };
-__thread S s;		/* { dg-error "run-time initialization" } */
+__thread S s;		/* { dg-error "non-POD" } */