diff --git a/test/SemaCXX/copy-assignment.cpp b/test/SemaCXX/copy-assignment.cpp
index 7aca9d6..798582c 100644
--- a/test/SemaCXX/copy-assignment.cpp
+++ b/test/SemaCXX/copy-assignment.cpp
@@ -98,18 +98,13 @@
 }
 
 // <rdar://problem/8315440>: Don't crash
-// FIXME: the recovery here is really bad.
 namespace test1 {
   template<typename T> class A : public unknown::X { // expected-error {{undeclared identifier 'unknown'}} expected-error {{expected class name}}
-    A(UndeclaredType n) : X(n) {} // expected-error{{expected ')'}} expected-note{{to match this '('}} \
-    // expected-error{{use of undeclared identifier 'n'}} \
-    // expected-error{{expected ';' at end of declaration list}} \
-    // expected-error{{field has incomplete type 'test1::A<char>'}}
+    A(UndeclaredType n) : X(n) {} // expected-error {{unknown type name 'UndeclaredType'}}
   };
   template<typename T> class B : public A<T>     {
     virtual void foo() {}
   };
-  extern template class A<char>; // expected-note {{in instantiation of template class 'test1::A<char>' requested here}} \
-                                 // expected-note {{definition of 'test1::A<char>' is not complete until the closing '}'}}
+  extern template class A<char>;
   extern template class B<char>;
 }