diff --git a/clang/test/Analysis/PR37855.c b/clang/test/Analysis/z3/PR37855.c
similarity index 100%
rename from clang/test/Analysis/PR37855.c
rename to clang/test/Analysis/z3/PR37855.c
diff --git a/clang/test/Analysis/bitint-z3.c b/clang/test/Analysis/z3/bitint-z3.c
similarity index 100%
rename from clang/test/Analysis/bitint-z3.c
rename to clang/test/Analysis/z3/bitint-z3.c
diff --git a/clang/test/Analysis/cstring-addrspace.c b/clang/test/Analysis/z3/cstring-addrspace.c
similarity index 100%
rename from clang/test/Analysis/cstring-addrspace.c
rename to clang/test/Analysis/z3/cstring-addrspace.c
diff --git a/clang/test/Analysis/unary-sym-expr-z3-refutation.c b/clang/test/Analysis/z3/unary-sym-expr-z3-refutation.c
similarity index 100%
rename from clang/test/Analysis/unary-sym-expr-z3-refutation.c
rename to clang/test/Analysis/z3/unary-sym-expr-z3-refutation.c
diff --git a/clang/test/Analysis/z3-crosscheck-max-attempts.cpp b/clang/test/Analysis/z3/z3-crosscheck-max-attempts.cpp
similarity index 100%
rename from clang/test/Analysis/z3-crosscheck-max-attempts.cpp
rename to clang/test/Analysis/z3/z3-crosscheck-max-attempts.cpp
diff --git a/clang/test/Analysis/z3-crosscheck.c b/clang/test/Analysis/z3/z3-crosscheck.c
similarity index 99%
rename from clang/test/Analysis/z3-crosscheck.c
rename to clang/test/Analysis/z3/z3-crosscheck.c
index 8cbe7dd2975d0..41ecaee5529e0 100644
--- a/clang/test/Analysis/z3-crosscheck.c
+++ b/clang/test/Analysis/z3/z3-crosscheck.c
@@ -4,7 +4,7 @@
 
 void clang_analyzer_dump(float);
 
-int foo(int x) 
+int foo(int x)
 {
   int *z = 0;
   if ((x & 1) && ((x & 1) ^ 1))
diff --git a/clang/test/Analysis/z3-refute-enum-crash.cpp b/clang/test/Analysis/z3/z3-refute-enum-crash.cpp
similarity index 100%
rename from clang/test/Analysis/z3-refute-enum-crash.cpp
rename to clang/test/Analysis/z3/z3-refute-enum-crash.cpp
diff --git a/clang/test/Analysis/z3-unarysymexpr.c b/clang/test/Analysis/z3/z3-unarysymexpr.c
similarity index 100%
rename from clang/test/Analysis/z3-unarysymexpr.c
rename to clang/test/Analysis/z3/z3-unarysymexpr.c