diff --git a/clang/test/CodeGenObjCXX/debug-info-block-capture-this.mm b/clang/test/DebugInfo/ObjCXX/block-capture-this.mm
similarity index 100%
rename from clang/test/CodeGenObjCXX/debug-info-block-capture-this.mm
rename to clang/test/DebugInfo/ObjCXX/block-capture-this.mm
diff --git a/clang/test/CodeGenObjCXX/debug-info-cyclic.mm b/clang/test/DebugInfo/ObjCXX/cyclic.mm
similarity index 100%
rename from clang/test/CodeGenObjCXX/debug-info-cyclic.mm
rename to clang/test/DebugInfo/ObjCXX/cyclic.mm
diff --git a/clang/test/CodeGenObjCXX/debug-info.mm b/clang/test/DebugInfo/ObjCXX/debug-info.mm
similarity index 100%
rename from clang/test/CodeGenObjCXX/debug-info.mm
rename to clang/test/DebugInfo/ObjCXX/debug-info.mm
diff --git a/clang/test/CodeGenObjCXX/debug-info-line.mm b/clang/test/DebugInfo/ObjCXX/line.mm
similarity index 100%
rename from clang/test/CodeGenObjCXX/debug-info-line.mm
rename to clang/test/DebugInfo/ObjCXX/line.mm
diff --git a/clang/test/CodeGenObjCXX/nested-ehlocation.mm b/clang/test/DebugInfo/ObjCXX/nested-ehlocation.mm
similarity index 100%
rename from clang/test/CodeGenObjCXX/nested-ehlocation.mm
rename to clang/test/DebugInfo/ObjCXX/nested-ehlocation.mm
diff --git a/clang/test/CodeGenObjCXX/pr14474-gline-tables-only.mm b/clang/test/DebugInfo/ObjCXX/pr14474-gline-tables-only.mm
similarity index 100%
rename from clang/test/CodeGenObjCXX/pr14474-gline-tables-only.mm
rename to clang/test/DebugInfo/ObjCXX/pr14474-gline-tables-only.mm