diff --git a/test/Preprocessor/microsoft-header-search/a/b/include3.h b/test/Preprocessor/Inputs/microsoft-header-search/a/b/include3.h
similarity index 100%
rename from test/Preprocessor/microsoft-header-search/a/b/include3.h
rename to test/Preprocessor/Inputs/microsoft-header-search/a/b/include3.h
diff --git a/test/Preprocessor/microsoft-header-search/a/findme.h b/test/Preprocessor/Inputs/microsoft-header-search/a/findme.h
similarity index 100%
rename from test/Preprocessor/microsoft-header-search/a/findme.h
rename to test/Preprocessor/Inputs/microsoft-header-search/a/findme.h
diff --git a/test/Preprocessor/microsoft-header-search/a/include2.h b/test/Preprocessor/Inputs/microsoft-header-search/a/include2.h
similarity index 100%
rename from test/Preprocessor/microsoft-header-search/a/include2.h
rename to test/Preprocessor/Inputs/microsoft-header-search/a/include2.h
diff --git a/test/Preprocessor/microsoft-header-search/findme.h b/test/Preprocessor/Inputs/microsoft-header-search/findme.h
similarity index 100%
rename from test/Preprocessor/microsoft-header-search/findme.h
rename to test/Preprocessor/Inputs/microsoft-header-search/findme.h
diff --git a/test/Preprocessor/microsoft-header-search/include1.h b/test/Preprocessor/Inputs/microsoft-header-search/include1.h
similarity index 100%
rename from test/Preprocessor/microsoft-header-search/include1.h
rename to test/Preprocessor/Inputs/microsoft-header-search/include1.h
diff --git a/test/Preprocessor/microsoft-header-search.c b/test/Preprocessor/microsoft-header-search.c
index 6c39b968ef298990b1341a5185b310b36593ad65..d0fc70676434a2a392441bb4c3ac61bd0d58f204 100644
--- a/test/Preprocessor/microsoft-header-search.c
+++ b/test/Preprocessor/microsoft-header-search.c
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -I%S/microsoft-header-search %s -fms-compatibility -verify
+// RUN: %clang_cc1 -I%S/Inputs/microsoft-header-search %s -fms-compatibility -verify
 
-// expected-warning@microsoft-header-search/a/findme.h:3 {{findme.h successfully included using MS search rules}}
-// expected-warning@microsoft-header-search/a/b/include3.h:3 {{#include resolved using non-portable MSVC search rules as}}
+// expected-warning@Inputs/microsoft-header-search/a/findme.h:3 {{findme.h successfully included using MS search rules}}
+// expected-warning@Inputs/microsoft-header-search/a/b/include3.h:3 {{#include resolved using non-portable MSVC search rules as}}
 
-#include "microsoft-header-search/include1.h"
\ No newline at end of file
+#include "Inputs/microsoft-header-search/include1.h"