diff --git a/clang/test/ARCMT/with space/test.h b/clang/test/ARCMT/Inputs/with space/test.h
similarity index 100%
rename from clang/test/ARCMT/with space/test.h
rename to clang/test/ARCMT/Inputs/with space/test.h
diff --git a/clang/test/ARCMT/with space/test.h.result b/clang/test/ARCMT/Inputs/with space/test.h.result
similarity index 100%
rename from clang/test/ARCMT/with space/test.h.result
rename to clang/test/ARCMT/Inputs/with space/test.h.result
diff --git a/clang/test/ARCMT/with space/test1.m.in b/clang/test/ARCMT/Inputs/with space/test1.m.in
similarity index 100%
rename from clang/test/ARCMT/with space/test1.m.in
rename to clang/test/ARCMT/Inputs/with space/test1.m.in
diff --git a/clang/test/ARCMT/with space/test1.m.in.result b/clang/test/ARCMT/Inputs/with space/test1.m.in.result
similarity index 100%
rename from clang/test/ARCMT/with space/test1.m.in.result
rename to clang/test/ARCMT/Inputs/with space/test1.m.in.result
diff --git a/clang/test/ARCMT/with space/test2.m.in b/clang/test/ARCMT/Inputs/with space/test2.m.in
similarity index 100%
rename from clang/test/ARCMT/with space/test2.m.in
rename to clang/test/ARCMT/Inputs/with space/test2.m.in
diff --git a/clang/test/ARCMT/with space/test2.m.in.result b/clang/test/ARCMT/Inputs/with space/test2.m.in.result
similarity index 100%
rename from clang/test/ARCMT/with space/test2.m.in.result
rename to clang/test/ARCMT/Inputs/with space/test2.m.in.result
diff --git a/clang/test/ARCMT/migrate-space-in-path.m b/clang/test/ARCMT/migrate-space-in-path.m
index a797e6d1f482f..d060485ee20e2 100644
--- a/clang/test/ARCMT/migrate-space-in-path.m
+++ b/clang/test/ARCMT/migrate-space-in-path.m
@@ -1,5 +1,5 @@
 // RUN: rm -rf %t.migrate
-// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t.migrate %S/"with space"/test1.m.in -x objective-c 
-// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t.migrate %S/"with space"/test2.m.in -x objective-c 
-// RUN: c-arcmt-test -mt-migrate-directory %t.migrate | arcmt-test -verify-transformed-files %S/"with space"/test1.m.in.result %S/"with space"/test2.m.in.result %S/"with space"/test.h.result
+// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t.migrate %S/Inputs/"with space"/test1.m.in -x objective-c
+// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t.migrate %S/Inputs/"with space"/test2.m.in -x objective-c
+// RUN: c-arcmt-test -mt-migrate-directory %t.migrate | arcmt-test -verify-transformed-files %S/Inputs/"with space"/test1.m.in.result %S/Inputs/"with space"/test2.m.in.result %S/Inputs/"with space"/test.h.result
 // RUN: rm -rf %t.migrate
diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt
index c2e2d31e5ce3c..f4be0adf14f85 100644
--- a/clang/test/CMakeLists.txt
+++ b/clang/test/CMakeLists.txt
@@ -93,6 +93,11 @@ add_lit_testsuite(check-clang "Running the Clang regression tests"
   )
 set_target_properties(check-clang PROPERTIES FOLDER "Clang tests")
 
+add_lit_testsuites(CLANG ${CMAKE_CURRENT_SOURCE_DIR}
+  PARAMS ${CLANG_TEST_PARAMS}
+  DEPENDS ${CLANG_TEST_DEPS}
+)
+
 # Add a legacy target spelling: clang-test
 add_custom_target(clang-test)
 add_dependencies(clang-test check-clang)
diff --git a/clang/test/PCH/libroot/usr/include/reloc.h b/clang/test/PCH/Inputs/libroot/usr/include/reloc.h
similarity index 100%
rename from clang/test/PCH/libroot/usr/include/reloc.h
rename to clang/test/PCH/Inputs/libroot/usr/include/reloc.h
diff --git a/clang/test/PCH/libroot/usr/include/reloc2.h b/clang/test/PCH/Inputs/libroot/usr/include/reloc2.h
similarity index 100%
rename from clang/test/PCH/libroot/usr/include/reloc2.h
rename to clang/test/PCH/Inputs/libroot/usr/include/reloc2.h
diff --git a/clang/test/PCH/reloc.c b/clang/test/PCH/reloc.c
index bf70ab6f69222..14788f019f137 100644
--- a/clang/test/PCH/reloc.c
+++ b/clang/test/PCH/reloc.c
@@ -1,7 +1,7 @@
 // RUN: %clang -target x86_64-apple-darwin10 --relocatable-pch -o %t \
-// RUN:   -isysroot %S/libroot %S/libroot/usr/include/reloc.h
+// RUN:   -isysroot %S/Inputs/libroot %S/Inputs/libroot/usr/include/reloc.h
 // RUN: %clang -target x86_64-apple-darwin10 -fsyntax-only \
-// RUN:   -include-pch %t -isysroot %S/libroot %s -Xclang -verify
+// RUN:   -include-pch %t -isysroot %S/Inputs/libroot %s -Xclang -verify
 // RUN: not %clang -target x86_64-apple-darwin10 -include-pch %t %s
 // REQUIRES: x86-registered-target
 
@@ -11,5 +11,5 @@ int x = 2; // expected-error{{redefinition}}
 int y = 5; // expected-error{{redefinition}}
 
 
-// expected-note@libroot/usr/include/reloc.h:13{{previous definition}}
-// expected-note@libroot/usr/include/reloc2.h:14{{previous definition}}
+// expected-note@Inputs/libroot/usr/include/reloc.h:13{{previous definition}}
+// expected-note@Inputs/libroot/usr/include/reloc2.h:14{{previous definition}}