4 files changed, 7 insertions, 8 deletions
diff --git a/clang/test/CXX/basic/basic.lookup/basic.lookup.unqual/p14.cpp b/clang/test/CXX/basic/basic.lookup/basic.lookup.unqual/p14.cpp
index 2ed87b4e68c..0fa4f650b0b 100644
--- a/clang/test/CXX/basic/basic.lookup/basic.lookup.unqual/p14.cpp
+++ b/clang/test/CXX/basic/basic.lookup/basic.lookup.unqual/p14.cpp
@@ -15,4 +15,4 @@ namespace N {
 
 int i = 2; 
 N::S N::j = i;
-N::S N::j(i);
+N::S N::j2(i);
diff --git a/clang/test/SemaCXX/copy-constructor-error.cpp b/clang/test/SemaCXX/copy-constructor-error.cpp
index bdf635d02f2..9cae77504b5 100644
--- a/clang/test/SemaCXX/copy-constructor-error.cpp
+++ b/clang/test/SemaCXX/copy-constructor-error.cpp
@@ -1,13 +1,12 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s 
 
-struct S { // expected-note {{candidate function}} 
-   S (S);  // expected-error {{copy constructor must pass its first argument by reference}} \\
-           // expected-note {{candidate function}}
+struct S {
+   S (S);  // expected-error {{copy constructor must pass its first argument by reference}}
 };
 
 S f();
 
 void g() { 
-  S a( f() );  // expected-error {{call to constructor of 'a' is ambiguous}}
+  S a( f() );
 }
 
diff --git a/clang/test/SemaCXX/default2.cpp b/clang/test/SemaCXX/default2.cpp
index eda4be29192..880255e4531 100644
--- a/clang/test/SemaCXX/default2.cpp
+++ b/clang/test/SemaCXX/default2.cpp
@@ -90,12 +90,12 @@ public:
   }
 
   void test_Z(const Z& z) {
-    Z z2(z); // expected-error{{no matching constructor for initialization of 'z2'}}
+    Z z2(z); // expected-error{{no matching constructor for initialization of 'class Z'}}
   }
 };
 
 void test_Z(const Z& z) {
-  Z z2(z); // expected-error{{no matching constructor for initialization of 'z2'}}
+  Z z2(z); // expected-error{{no matching constructor for initialization of 'class Z'}}
 }
 
 struct ZZ {
diff --git a/clang/test/SemaCXX/direct-initializer.cpp b/clang/test/SemaCXX/direct-initializer.cpp
index 1a87a3edf33..03a5da3a303 100644
--- a/clang/test/SemaCXX/direct-initializer.cpp
+++ b/clang/test/SemaCXX/direct-initializer.cpp
@@ -28,7 +28,7 @@ public:
 void g() {
   X x1(5);
   X x2(1.0, 3, 4.2);
-  X x3(1.0, 1.0); // expected-error{{no matching constructor for initialization of 'x3'; candidates are:}}
+  X x3(1.0, 1.0); // expected-error{{no matching constructor for initialization of 'class X'}}
   Y y(1.0);
   X x4(3.14, y);