diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7d2bcc0f0b0ffec0666b4fd7f55746d912ace986..5a6e6ed302ad62b87703628abb42055ff323ab42 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -6,6 +6,10 @@
 
 2005-01-01  Geoffrey Keating  <geoffk@geoffk.org>
 
+	* g++.dg/ext/visibility/fvisibility-override1.C: Test using
+	'hidden' and 'default' for better portability.
+	* g++.dg/ext/visibility/fvisibility-override2.C: Likewise.
+
 	* g++.old-deja/g++.abi/cxa_vec.C: Add -flat_namespace on Darwin
 	6 and 7.
 	* g++.old-deja/g++.brendan/new3.C: Likewise.
diff --git a/gcc/testsuite/g++.dg/ext/visibility/fvisibility-override1.C b/gcc/testsuite/g++.dg/ext/visibility/fvisibility-override1.C
index 67d5ef09f60e95f2bad7f5cfeb9c6f24fbdcbb7f..685cd13091f5c52e85b0679f328a091228a10e67 100644
--- a/gcc/testsuite/g++.dg/ext/visibility/fvisibility-override1.C
+++ b/gcc/testsuite/g++.dg/ext/visibility/fvisibility-override1.C
@@ -2,9 +2,9 @@
 /* { dg-do compile } */
 /* { dg-require-visibility "" } */
 /* { dg-options "-fvisibility=hidden" } */
-/* { dg-final { scan-assembler "\\.internal.*Foo.methodEv" } } */
+/* { dg-final { scan-not-hidden "methodEv" } } */
 
-class __attribute__ ((visibility ("internal"))) Foo
+class __attribute__ ((visibility ("default"))) Foo
 {
   void method();
 };
diff --git a/gcc/testsuite/g++.dg/ext/visibility/fvisibility-override2.C b/gcc/testsuite/g++.dg/ext/visibility/fvisibility-override2.C
index a0a2df5e81b055f83238a769e9a34f58c79d9c76..07f0c07c72df0affd7d47ec3bb891f35e2890dd2 100644
--- a/gcc/testsuite/g++.dg/ext/visibility/fvisibility-override2.C
+++ b/gcc/testsuite/g++.dg/ext/visibility/fvisibility-override2.C
@@ -2,11 +2,11 @@
 /* { dg-do compile } */
 /* { dg-require-visibility "" } */
 /* { dg-options "-fvisibility=hidden" } */
-/* { dg-final { scan-assembler "\\.internal.*Foo.methodEv" } } */
+/* { dg-final { scan-not-hidden "Foo.methodEv" } } */
 
 class Foo
 {
-  __attribute__ ((visibility ("internal"))) void method();
+  __attribute__ ((visibility ("default"))) void method();
 };
 
 void Foo::method() { }