diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d5558e359fd..40bbebc8918 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2004-02-25  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
+	* g++.dg/opt/inline4.C (dg-final): Robustify regexp.
+	* g++.dg/opt/inline6.C (dg-final): Robustify regexp.
+
 	* gcc.dg/builtins-config.h (HAVE_C99_RUNTIME): Don't define for PA
 	HP-UX.
 
diff --git a/gcc/testsuite/g++.dg/opt/inline4.C b/gcc/testsuite/g++.dg/opt/inline4.C
index 1db4fe1860b..2eaad115fc1 100644
--- a/gcc/testsuite/g++.dg/opt/inline4.C
+++ b/gcc/testsuite/g++.dg/opt/inline4.C
@@ -10,4 +10,4 @@ void h() {
   g<250>();
 }
 
-// { dg-final { scan-assembler-not "_Z1g"  } }
+// { dg-final { scan-assembler-not "\n_?_Z1gILi\[0-9\]+EEvv\[: \t\n\]"  } }
diff --git a/gcc/testsuite/g++.dg/opt/inline6.C b/gcc/testsuite/g++.dg/opt/inline6.C
index 21872210558..b1616c7e721 100644
--- a/gcc/testsuite/g++.dg/opt/inline6.C
+++ b/gcc/testsuite/g++.dg/opt/inline6.C
@@ -1,6 +1,6 @@
 // PR c++/13081
 // { dg-options "-O2" }
-// { dg-final { scan-assembler-not "foo" } }
+// { dg-final { scan-assembler-not "\n_?_Z3fooIlET_S0_\[: \t\n\]" } }
 
 template<typename T> T foo(T);