diff --git a/gcc/testsuite/g++.old-deja/g++.pt/friend44.C b/gcc/testsuite/g++.old-deja/g++.pt/friend44.C
new file mode 100644
index 00000000000..db403b54155
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.pt/friend44.C
@@ -0,0 +1,44 @@
+// Test that template friends referring to class template members are
+// respected.
+
+// excess errors test - XFAIL *-*-*
+
+template <class T> struct A
+{
+  int f (T);
+  struct AI {
+    int f (T);
+  };
+};
+
+class B
+{
+  template <class T> friend int A<T>::f (T);
+  template <class T> friend struct A<T>::AI;
+  int a;
+public:
+  B(): a(0) { }
+};
+
+template <class T> int A<T>::f (T)
+{
+  B b;
+  return b.a;
+}
+
+template <class T> int A<T>::AI::f (T)
+{
+  B b;
+  return b.a;
+}
+
+int main ()
+{
+  A<int> a;
+  A<int>::AI ai;
+
+  int r = a.f (0);
+  r |= ai.f (0);
+
+  return r;
+}
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/overload13.C b/gcc/testsuite/g++.old-deja/g++.pt/overload13.C
new file mode 100644
index 00000000000..db5d807bb81
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.pt/overload13.C
@@ -0,0 +1,12 @@
+// Test that .template limits overload resolution to member templates.
+
+struct A {
+  template <class T> int f (T) { return 0; }
+  int f (int) { return 1; }
+};
+
+int main ()
+{
+  A a;
+  return a.template f (0); // gets bogus error XFAIL *-*-*
+}