diff --git a/test/Sema/class-names.cpp b/test/SemaCXX/class-names.cpp
similarity index 99%
rename from test/Sema/class-names.cpp
rename to test/SemaCXX/class-names.cpp
index 2a9cd74..22546ef 100644
--- a/test/Sema/class-names.cpp
+++ b/test/SemaCXX/class-names.cpp
@@ -1,52 +1,52 @@
-// RUN: clang -fsyntax-only -verify %s
-class C { };
-
-C c;
-
-void D(int);
-
-class D {}; // expected-error{{previous use is here}}
-
-void foo()
-{
-  D(5);
-  class D d;
-}
-
-class D; 
-
-enum D; // expected-error{{use of 'D' with tag type that does not match previous declaration}}
-
-class A * A;
-
-class A * a2;
-
-void bar()
-{
-  A = 0;
-}
-
-void C(int);
-
-void bar2()
-{
-  C(17);
-}
-
-extern int B;
-class B;
-class B {};
-int B;
-
-enum E { e1_val };
-E e1;
-
-void E(int);
-
-void bar3() {
-  E(17);
-}
-
-enum E e2;
-
-enum E2 { E2 };
+// RUN: clang -fsyntax-only -verify %s
+class C { };
+
+C c;
+
+void D(int);
+
+class D {}; // expected-error{{previous use is here}}
+
+void foo()
+{
+  D(5);
+  class D d;
+}
+
+class D; 
+
+enum D; // expected-error{{use of 'D' with tag type that does not match previous declaration}}
+
+class A * A;
+
+class A * a2;
+
+void bar()
+{
+  A = 0;
+}
+
+void C(int);
+
+void bar2()
+{
+  C(17);
+}
+
+extern int B;
+class B;
+class B {};
+int B;
+
+enum E { e1_val };
+E e1;
+
+void E(int);
+
+void bar3() {
+  E(17);
+}
+
+enum E e2;
+
+enum E2 { E2 };
diff --git a/test/Sema/default1.cpp b/test/SemaCXX/default1.cpp
similarity index 100%
rename from test/Sema/default1.cpp
rename to test/SemaCXX/default1.cpp
diff --git a/test/Sema/default2.cpp b/test/SemaCXX/default2.cpp
similarity index 100%
rename from test/Sema/default2.cpp
rename to test/SemaCXX/default2.cpp
diff --git a/test/Sema/inherit.cpp b/test/SemaCXX/inherit.cpp
similarity index 99%
rename from test/Sema/inherit.cpp
rename to test/SemaCXX/inherit.cpp
index f1f96f1..82d8db3 100644
--- a/test/Sema/inherit.cpp
+++ b/test/SemaCXX/inherit.cpp
@@ -1,25 +1,25 @@
-// RUN: clang -fsyntax-only -verify %s
-class A { };
-
-class B1 : A { };
-
-class B2 : virtual A { };
-
-class B3 : virtual virtual A { }; // expected-error{{duplicate 'virtual' in base specifier}}
-
-class C : public B1, private B2 { };
-
-
-class D;
-
-class E : public D { }; // expected-error{{base class has incomplete type}}
-
-typedef int I;
-
-class F : public I { }; // expected-error{{base specifier must name a class}}
-
-union U1 : public A { }; // expected-error{{unions cannot have base classes}}
-
-union U2 {};
-
-class G : public U2 { }; // expected-error{{unions cannot be base classes}}
+// RUN: clang -fsyntax-only -verify %s
+class A { };
+
+class B1 : A { };
+
+class B2 : virtual A { };
+
+class B3 : virtual virtual A { }; // expected-error{{duplicate 'virtual' in base specifier}}
+
+class C : public B1, private B2 { };
+
+
+class D;
+
+class E : public D { }; // expected-error{{base class has incomplete type}}
+
+typedef int I;
+
+class F : public I { }; // expected-error{{base specifier must name a class}}
+
+union U1 : public A { }; // expected-error{{unions cannot have base classes}}
+
+union U2 {};
+
+class G : public U2 { }; // expected-error{{unions cannot be base classes}}
diff --git a/test/Sema/return-stack-addr.cpp b/test/SemaCXX/return-stack-addr.cpp
similarity index 100%
rename from test/Sema/return-stack-addr.cpp
rename to test/SemaCXX/return-stack-addr.cpp