diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5ab7ce8dd21..a3b48fd858c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-08  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+	PR c++/11039
+	* g++.dg/warn/implicit-typename2.C: New test.
+	* g++.dg/warn/implicit-typename3.C: New test.
+
 2003-06-07  Richard Henderson  <rth@redhat.com>
 
 	* g++.dg/other/offsetof3.C: Use size_t.
diff --git a/gcc/testsuite/g++.dg/warn/implicit-typename2.C b/gcc/testsuite/g++.dg/warn/implicit-typename2.C
new file mode 100644
index 00000000000..2bd83cffa17
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/implicit-typename2.C
@@ -0,0 +1,12 @@
+// { dg-do compile }
+
+// Origin: Wolfgang Bangerth <bangerth@ticam.utexas.edu>
+
+// PR c++/11039: Implicit typename warning in friend class declaration.
+
+template <typename T> struct X {
+  struct Y {
+    struct Z {};
+  };
+  friend struct Y::Z;
+};
diff --git a/gcc/testsuite/g++.dg/warn/implicit-typename3.C b/gcc/testsuite/g++.dg/warn/implicit-typename3.C
new file mode 100644
index 00000000000..9b1ea8cfc5b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/implicit-typename3.C
@@ -0,0 +1,12 @@
+// { dg-do compile }
+
+// Origin: Wolfgang Bangerth <bangerth@ticam.utexas.edu>
+
+// PR c++/11039: Implicit typename warning in friend class declaration.
+
+template <typename T> struct X {
+  struct Y {
+    struct Z {};
+  };
+  template <typename U> friend struct Y::Z f(U);
+};