diff --git a/clang/test/CodeGen/align-systemz.c b/clang/test/CodeGen/SystemZ/align-systemz.c
rename from clang/test/CodeGen/align-systemz.c
rename to clang/test/CodeGen/SystemZ/align-systemz.c
diff --git a/clang/test/CodeGen/builtins-systemz-error.c b/clang/test/CodeGen/SystemZ/builtins-systemz-error.c
rename from clang/test/CodeGen/builtins-systemz-error.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-error.c
diff --git a/clang/test/CodeGen/builtins-systemz-error2.c b/clang/test/CodeGen/SystemZ/builtins-systemz-error2.c
rename from clang/test/CodeGen/builtins-systemz-error2.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-error2.c
diff --git a/clang/test/CodeGen/builtins-systemz-vector-constrained.c b/clang/test/CodeGen/SystemZ/builtins-systemz-vector-constrained.c
rename from clang/test/CodeGen/builtins-systemz-vector-constrained.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-vector-constrained.c
diff --git a/clang/test/CodeGen/builtins-systemz-vector-error.c b/clang/test/CodeGen/SystemZ/builtins-systemz-vector-error.c
rename from clang/test/CodeGen/builtins-systemz-vector-error.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-vector-error.c
diff --git a/clang/test/CodeGen/builtins-systemz-vector.c b/clang/test/CodeGen/SystemZ/builtins-systemz-vector.c
rename from clang/test/CodeGen/builtins-systemz-vector.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-vector.c
diff --git a/clang/test/CodeGen/builtins-systemz-vector2-constrained.c b/clang/test/CodeGen/SystemZ/builtins-systemz-vector2-constrained.c
rename from clang/test/CodeGen/builtins-systemz-vector2-constrained.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-vector2-constrained.c
diff --git a/clang/test/CodeGen/builtins-systemz-vector2-error.c b/clang/test/CodeGen/SystemZ/builtins-systemz-vector2-error.c
rename from clang/test/CodeGen/builtins-systemz-vector2-error.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-vector2-error.c
diff --git a/clang/test/CodeGen/builtins-systemz-vector2.c b/clang/test/CodeGen/SystemZ/builtins-systemz-vector2.c
rename from clang/test/CodeGen/builtins-systemz-vector2.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-vector2.c
diff --git a/clang/test/CodeGen/builtins-systemz-vector3-error.c b/clang/test/CodeGen/SystemZ/builtins-systemz-vector3-error.c
rename from clang/test/CodeGen/builtins-systemz-vector3-error.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-vector3-error.c
diff --git a/clang/test/CodeGen/builtins-systemz-vector3.c b/clang/test/CodeGen/SystemZ/builtins-systemz-vector3.c
rename from clang/test/CodeGen/builtins-systemz-vector3.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-vector3.c
diff --git a/clang/test/CodeGen/builtins-systemz-zvector-constrained.c b/clang/test/CodeGen/SystemZ/builtins-systemz-zvector-constrained.c
rename from clang/test/CodeGen/builtins-systemz-zvector-constrained.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-zvector-constrained.c
diff --git a/clang/test/CodeGen/builtins-systemz-zvector-error.c b/clang/test/CodeGen/SystemZ/builtins-systemz-zvector-error.c
rename from clang/test/CodeGen/builtins-systemz-zvector-error.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-zvector-error.c
diff --git a/clang/test/CodeGen/builtins-systemz-zvector.c b/clang/test/CodeGen/SystemZ/builtins-systemz-zvector.c
rename from clang/test/CodeGen/builtins-systemz-zvector.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-zvector.c
diff --git a/clang/test/CodeGen/builtins-systemz-zvector2-constrained.c b/clang/test/CodeGen/SystemZ/builtins-systemz-zvector2-constrained.c
rename from clang/test/CodeGen/builtins-systemz-zvector2-constrained.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-zvector2-constrained.c
diff --git a/clang/test/CodeGen/builtins-systemz-zvector2-error.c b/clang/test/CodeGen/SystemZ/builtins-systemz-zvector2-error.c
rename from clang/test/CodeGen/builtins-systemz-zvector2-error.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-zvector2-error.c
diff --git a/clang/test/CodeGen/builtins-systemz-zvector2.c b/clang/test/CodeGen/SystemZ/builtins-systemz-zvector2.c
rename from clang/test/CodeGen/builtins-systemz-zvector2.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-zvector2.c
diff --git a/clang/test/CodeGen/builtins-systemz-zvector3-constrained.c b/clang/test/CodeGen/SystemZ/builtins-systemz-zvector3-constrained.c
rename from clang/test/CodeGen/builtins-systemz-zvector3-constrained.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-zvector3-constrained.c
diff --git a/clang/test/CodeGen/builtins-systemz-zvector3-error.c b/clang/test/CodeGen/SystemZ/builtins-systemz-zvector3-error.c
rename from clang/test/CodeGen/builtins-systemz-zvector3-error.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-zvector3-error.c
diff --git a/clang/test/CodeGen/builtins-systemz-zvector3.c b/clang/test/CodeGen/SystemZ/builtins-systemz-zvector3.c
rename from clang/test/CodeGen/builtins-systemz-zvector3.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz-zvector3.c
diff --git a/clang/test/CodeGen/builtins-systemz.c b/clang/test/CodeGen/SystemZ/builtins-systemz.c
rename from clang/test/CodeGen/builtins-systemz.c
rename to clang/test/CodeGen/SystemZ/builtins-systemz.c
diff --git a/clang/test/CodeGen/mbackchain-2.c b/clang/test/CodeGen/SystemZ/mbackchain-2.c
rename from clang/test/CodeGen/mbackchain-2.c
rename to clang/test/CodeGen/SystemZ/mbackchain-2.c
diff --git a/clang/test/CodeGen/mbackchain-3.c b/clang/test/CodeGen/SystemZ/mbackchain-3.c
rename from clang/test/CodeGen/mbackchain-3.c
rename to clang/test/CodeGen/SystemZ/mbackchain-3.c
diff --git a/clang/test/CodeGen/mbackchain.c b/clang/test/CodeGen/SystemZ/mbackchain.c
rename from clang/test/CodeGen/mbackchain.c
rename to clang/test/CodeGen/SystemZ/mbackchain.c
diff --git a/clang/test/CodeGen/s390x-packed-struct-func-arg.c b/clang/test/CodeGen/SystemZ/s390x-packed-struct-func-arg.c
rename from clang/test/CodeGen/s390x-packed-struct-func-arg.c
rename to clang/test/CodeGen/SystemZ/s390x-packed-struct-func-arg.c
diff --git a/clang/test/CodeGen/systemz-abi-vector.c b/clang/test/CodeGen/SystemZ/systemz-abi-vector.c
rename from clang/test/CodeGen/systemz-abi-vector.c
rename to clang/test/CodeGen/SystemZ/systemz-abi-vector.c
diff --git a/clang/test/CodeGen/systemz-abi.c b/clang/test/CodeGen/SystemZ/systemz-abi.c
rename from clang/test/CodeGen/systemz-abi.c
rename to clang/test/CodeGen/SystemZ/systemz-abi.c
diff --git a/clang/test/CodeGen/systemz-inline-asm-02.c b/clang/test/CodeGen/SystemZ/systemz-inline-asm-02.c
rename from clang/test/CodeGen/systemz-inline-asm-02.c
rename to clang/test/CodeGen/SystemZ/systemz-inline-asm-02.c
diff --git a/clang/test/CodeGen/systemz-inline-asm.c b/clang/test/CodeGen/SystemZ/systemz-inline-asm.c
rename from clang/test/CodeGen/systemz-inline-asm.c
rename to clang/test/CodeGen/SystemZ/systemz-inline-asm.c
diff --git a/clang/test/CodeGen/zos-alignment.c b/clang/test/CodeGen/SystemZ/zos-alignment.c
rename from clang/test/CodeGen/zos-alignment.c
rename to clang/test/CodeGen/SystemZ/zos-alignment.c
diff --git a/clang/test/CodeGen/zvector.c b/clang/test/CodeGen/SystemZ/zvector.c
rename from clang/test/CodeGen/zvector.c
rename to clang/test/CodeGen/SystemZ/zvector.c
diff --git a/clang/test/CodeGen/zvector2.c b/clang/test/CodeGen/SystemZ/zvector2.c
rename from clang/test/CodeGen/zvector2.c
rename to clang/test/CodeGen/SystemZ/zvector2.c