diff --git a/clang/test/Analysis/system-header-simulator-cxx.h b/clang/test/Analysis/Inputs/system-header-simulator-cxx.h
similarity index 100%
rename from clang/test/Analysis/system-header-simulator-cxx.h
rename to clang/test/Analysis/Inputs/system-header-simulator-cxx.h
diff --git a/clang/test/Analysis/system-header-simulator-objc.h b/clang/test/Analysis/Inputs/system-header-simulator-objc.h
similarity index 100%
rename from clang/test/Analysis/system-header-simulator-objc.h
rename to clang/test/Analysis/Inputs/system-header-simulator-objc.h
diff --git a/clang/test/Analysis/system-header-simulator.h b/clang/test/Analysis/Inputs/system-header-simulator.h
similarity index 100%
rename from clang/test/Analysis/system-header-simulator.h
rename to clang/test/Analysis/Inputs/system-header-simulator.h
diff --git a/clang/test/Analysis/coverage.c b/clang/test/Analysis/coverage.c
index 811691391eb1..66f0a5e385b9 100644
--- a/clang/test/Analysis/coverage.c
+++ b/clang/test/Analysis/coverage.c
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -analyze -analyzer-checker=core,unix.Malloc -analyzer-store=region -analyzer-max-loop 4 -verify %s
-#include "system-header-simulator.h"
+#include "Inputs/system-header-simulator.h"
 
 typedef __typeof(sizeof(int)) size_t;
 void *malloc(size_t);
diff --git a/clang/test/Analysis/global-region-invalidation.c b/clang/test/Analysis/global-region-invalidation.c
index ee6b55c79603..2d64b49a8baf 100644
--- a/clang/test/Analysis/global-region-invalidation.c
+++ b/clang/test/Analysis/global-region-invalidation.c
@@ -3,7 +3,7 @@
 void clang_analyzer_eval(int);
 
 // Note, we do need to include headers here, since the analyzer checks if the function declaration is located in a system header.
-#include "system-header-simulator.h"
+#include "Inputs/system-header-simulator.h"
 
 // Test that system header does not invalidate the internal global.
 int size_rdar9373039 = 1;
diff --git a/clang/test/Analysis/inlining/stl.cpp b/clang/test/Analysis/inlining/stl.cpp
index 56670a0f16d2..cec782151c95 100644
--- a/clang/test/Analysis/inlining/stl.cpp
+++ b/clang/test/Analysis/inlining/stl.cpp
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -analyze -analyzer-checker=core,unix.Malloc,debug.ExprInspection -analyzer-ipa=dynamic -analyzer-config c++-stdlib-inlining=false -verify %s
 // RUN: %clang_cc1 -analyze -analyzer-checker=core,unix.Malloc,debug.ExprInspection -analyzer-ipa=dynamic -analyzer-config c++-stdlib-inlining=true -DINLINE=1 -verify %s
 
-#include "../system-header-simulator-cxx.h"
+#include "../Inputs/system-header-simulator-cxx.h"
 
 void clang_analyzer_eval(bool);
 
diff --git a/clang/test/Analysis/malloc-interprocedural.c b/clang/test/Analysis/malloc-interprocedural.c
index c804219eb4df..0ab3a7155858 100644
--- a/clang/test/Analysis/malloc-interprocedural.c
+++ b/clang/test/Analysis/malloc-interprocedural.c
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 -analyze -analyzer-checker=unix.Malloc -analyzer-inline-max-stack-depth=5 -analyzer-inline-max-function-size=6 -verify %s
 
-#include "system-header-simulator.h"
+#include "Inputs/system-header-simulator.h"
 
 typedef __typeof(sizeof(int)) size_t;
 void *malloc(size_t);
diff --git a/clang/test/Analysis/malloc.c b/clang/test/Analysis/malloc.c
index fe99fa10d685..52a79243ce4e 100644
--- a/clang/test/Analysis/malloc.c
+++ b/clang/test/Analysis/malloc.c
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -analyze -analyzer-checker=core,alpha.deadcode.UnreachableCode,alpha.core.CastSize,unix.Malloc,debug.ExprInspection -analyzer-store=region -verify %s
-#include "system-header-simulator.h"
+#include "Inputs/system-header-simulator.h"
 
 void clang_analyzer_eval(int);
 
diff --git a/clang/test/Analysis/malloc.m b/clang/test/Analysis/malloc.m
index 08206f3bf14c..21d2dafa38b6 100644
--- a/clang/test/Analysis/malloc.m
+++ b/clang/test/Analysis/malloc.m
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -analyze -analyzer-checker=core,unix.Malloc -analyzer-store=region -verify -Wno-objc-root-class -fblocks %s
-#include "system-header-simulator-objc.h"
+#include "Inputs/system-header-simulator-objc.h"
 
 @class NSString;
 typedef __typeof(sizeof(int)) size_t;
diff --git a/clang/test/Analysis/malloc.mm b/clang/test/Analysis/malloc.mm
index 7a9d881b1518..b5a1aeb12b89 100644
--- a/clang/test/Analysis/malloc.mm
+++ b/clang/test/Analysis/malloc.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -analyze -analyzer-checker=core,unix.Malloc -analyzer-store=region -verify -fblocks %s
-#include "system-header-simulator-objc.h"
+#include "Inputs/system-header-simulator-objc.h"
 
 typedef __typeof(sizeof(int)) size_t;
 void *malloc(size_t);
@@ -221,4 +221,4 @@ void foo(NSPointerArray* pointerArray) {
 void noCrashOnVariableArgumentSelector() {
   NSMutableString *myString = [NSMutableString stringWithString:@"some text"];
   [myString appendFormat:@"some text = %d", 3];
-}
\ No newline at end of file
+}