diff --git a/llvm/test/tools/obj2yaml/coff-bss.s b/llvm/test/tools/obj2yaml/COFF/bss.s
rename from llvm/test/tools/obj2yaml/coff-bss.s
rename to llvm/test/tools/obj2yaml/COFF/bss.s
diff --git a/llvm/test/tools/obj2yaml/coff-long-file-symbol.test b/llvm/test/tools/obj2yaml/COFF/long-file-symbol.yaml
rename from llvm/test/tools/obj2yaml/coff-long-file-symbol.test
rename to llvm/test/tools/obj2yaml/COFF/long-file-symbol.yaml
diff --git a/llvm/test/tools/obj2yaml/coff-long-section-name.test b/llvm/test/tools/obj2yaml/COFF/long-section-name.yaml
rename from llvm/test/tools/obj2yaml/coff-long-section-name.test
rename to llvm/test/tools/obj2yaml/COFF/long-section-name.yaml
diff --git a/llvm/test/tools/obj2yaml/coff-section-aux-symbol.test b/llvm/test/tools/obj2yaml/COFF/section-aux-symbol.yaml
rename from llvm/test/tools/obj2yaml/coff-section-aux-symbol.test
rename to llvm/test/tools/obj2yaml/COFF/section-aux-symbol.yaml
diff --git a/llvm/test/tools/obj2yaml/coff-weak-external.test b/llvm/test/tools/obj2yaml/COFF/weak-external.yaml
rename from llvm/test/tools/obj2yaml/coff-weak-external.test
rename to llvm/test/tools/obj2yaml/COFF/weak-external.yaml
diff --git a/llvm/test/tools/obj2yaml/call-graph-profile-section.yaml b/llvm/test/tools/obj2yaml/ELF/call-graph-profile-section.yaml
rename from llvm/test/tools/obj2yaml/call-graph-profile-section.yaml
rename to llvm/test/tools/obj2yaml/ELF/call-graph-profile-section.yaml
diff --git a/llvm/test/tools/obj2yaml/duplicate-symbol-and-section-names.test b/llvm/test/tools/obj2yaml/ELF/duplicate-symbol-and-section-names.yaml
rename from llvm/test/tools/obj2yaml/duplicate-symbol-and-section-names.test
rename to llvm/test/tools/obj2yaml/ELF/duplicate-symbol-and-section-names.yaml
diff --git a/llvm/test/tools/obj2yaml/dynamic-section-arch-tags.test b/llvm/test/tools/obj2yaml/ELF/dynamic-section-arch-tags.yaml
rename from llvm/test/tools/obj2yaml/dynamic-section-arch-tags.test
rename to llvm/test/tools/obj2yaml/ELF/dynamic-section-arch-tags.yaml
diff --git a/llvm/test/tools/obj2yaml/dynamic-section.test b/llvm/test/tools/obj2yaml/ELF/dynamic-section.yaml
rename from llvm/test/tools/obj2yaml/dynamic-section.test
rename to llvm/test/tools/obj2yaml/ELF/dynamic-section.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-emachine.yaml b/llvm/test/tools/obj2yaml/ELF/emachine.yaml
rename from llvm/test/tools/obj2yaml/elf-emachine.yaml
rename to llvm/test/tools/obj2yaml/ELF/emachine.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-entsize.yaml b/llvm/test/tools/obj2yaml/ELF/entsize.yaml
rename from llvm/test/tools/obj2yaml/elf-entsize.yaml
rename to llvm/test/tools/obj2yaml/ELF/entsize.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-gnu-hash-section.yaml b/llvm/test/tools/obj2yaml/ELF/gnu-hash-section.yaml
rename from llvm/test/tools/obj2yaml/elf-gnu-hash-section.yaml
rename to llvm/test/tools/obj2yaml/ELF/gnu-hash-section.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-gnu-unique-symbols.yaml b/llvm/test/tools/obj2yaml/ELF/gnu-unique-symbols.yaml
rename from llvm/test/tools/obj2yaml/elf-gnu-unique-symbols.yaml
rename to llvm/test/tools/obj2yaml/ELF/gnu-unique-symbols.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-hash-section.yaml b/llvm/test/tools/obj2yaml/ELF/hash-section.yaml
rename from llvm/test/tools/obj2yaml/elf-hash-section.yaml
rename to llvm/test/tools/obj2yaml/ELF/hash-section.yaml
diff --git a/llvm/test/tools/obj2yaml/implicit-sections-order.yaml b/llvm/test/tools/obj2yaml/ELF/implicit-sections-order.yaml
rename from llvm/test/tools/obj2yaml/implicit-sections-order.yaml
rename to llvm/test/tools/obj2yaml/ELF/implicit-sections-order.yaml
diff --git a/llvm/test/tools/obj2yaml/invalid-section-name.yaml b/llvm/test/tools/obj2yaml/ELF/invalid-section-name.yaml
rename from llvm/test/tools/obj2yaml/invalid-section-name.yaml
rename to llvm/test/tools/obj2yaml/ELF/invalid-section-name.yaml
diff --git a/llvm/test/tools/obj2yaml/linker-options.yaml b/llvm/test/tools/obj2yaml/ELF/linker-options.yaml
rename from llvm/test/tools/obj2yaml/linker-options.yaml
rename to llvm/test/tools/obj2yaml/ELF/linker-options.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-llvm-addrsig-section.yaml b/llvm/test/tools/obj2yaml/ELF/llvm-addrsig-section.yaml
rename from llvm/test/tools/obj2yaml/elf-llvm-addrsig-section.yaml
rename to llvm/test/tools/obj2yaml/ELF/llvm-addrsig-section.yaml
diff --git a/llvm/test/tools/obj2yaml/llvm-deplibs-section.yaml b/llvm/test/tools/obj2yaml/ELF/llvm-deplibs-section.yaml
rename from llvm/test/tools/obj2yaml/llvm-deplibs-section.yaml
rename to llvm/test/tools/obj2yaml/ELF/llvm-deplibs-section.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-mips-eflags.yaml b/llvm/test/tools/obj2yaml/ELF/mips-eflags.yaml
rename from llvm/test/tools/obj2yaml/elf-mips-eflags.yaml
rename to llvm/test/tools/obj2yaml/ELF/mips-eflags.yaml
diff --git a/llvm/test/tools/obj2yaml/no-symbol-reloc.test b/llvm/test/tools/obj2yaml/ELF/no-symbol-reloc.yaml
rename from llvm/test/tools/obj2yaml/no-symbol-reloc.test
rename to llvm/test/tools/obj2yaml/ELF/no-symbol-reloc.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-no-symtab.yaml b/llvm/test/tools/obj2yaml/ELF/no-symtab.yaml
rename from llvm/test/tools/obj2yaml/elf-no-symtab.yaml
rename to llvm/test/tools/obj2yaml/ELF/no-symtab.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-null-section.yaml b/llvm/test/tools/obj2yaml/ELF/null-section.yaml
rename from llvm/test/tools/obj2yaml/elf-null-section.yaml
rename to llvm/test/tools/obj2yaml/ELF/null-section.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-ppc64-relocations.yaml b/llvm/test/tools/obj2yaml/ELF/ppc64-relocations.yaml
rename from llvm/test/tools/obj2yaml/elf-ppc64-relocations.yaml
rename to llvm/test/tools/obj2yaml/ELF/ppc64-relocations.yaml
diff --git a/llvm/test/tools/obj2yaml/program-headers.yaml b/llvm/test/tools/obj2yaml/ELF/program-headers.yaml
rename from llvm/test/tools/obj2yaml/program-headers.yaml
rename to llvm/test/tools/obj2yaml/ELF/program-headers.yaml
diff --git a/llvm/test/tools/obj2yaml/rel-rela-section.yaml b/llvm/test/tools/obj2yaml/ELF/rel-rela-section.yaml
rename from llvm/test/tools/obj2yaml/rel-rela-section.yaml
rename to llvm/test/tools/obj2yaml/ELF/rel-rela-section.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-reladyn-section-shinfo.yaml b/llvm/test/tools/obj2yaml/ELF/reladyn-section-shinfo.yaml
rename from llvm/test/tools/obj2yaml/elf-reladyn-section-shinfo.yaml
rename to llvm/test/tools/obj2yaml/ELF/reladyn-section-shinfo.yaml
diff --git a/llvm/test/tools/obj2yaml/relocation-addend.yaml b/llvm/test/tools/obj2yaml/ELF/relocation-addend.yaml
rename from llvm/test/tools/obj2yaml/relocation-addend.yaml
rename to llvm/test/tools/obj2yaml/ELF/relocation-addend.yaml
diff --git a/llvm/test/tools/obj2yaml/relocation-type.yaml b/llvm/test/tools/obj2yaml/ELF/relocation-type.yaml
rename from llvm/test/tools/obj2yaml/relocation-type.yaml
rename to llvm/test/tools/obj2yaml/ELF/relocation-type.yaml
diff --git a/llvm/test/tools/obj2yaml/relr-section.yaml b/llvm/test/tools/obj2yaml/ELF/relr-section.yaml
rename from llvm/test/tools/obj2yaml/relr-section.yaml
rename to llvm/test/tools/obj2yaml/ELF/relr-section.yaml
diff --git a/llvm/test/tools/obj2yaml/section-group.test b/llvm/test/tools/obj2yaml/ELF/section-group.yaml
rename from llvm/test/tools/obj2yaml/section-group.test
rename to llvm/test/tools/obj2yaml/ELF/section-group.yaml
diff --git a/llvm/test/tools/obj2yaml/section-type.yaml b/llvm/test/tools/obj2yaml/ELF/section-type.yaml
rename from llvm/test/tools/obj2yaml/section-type.yaml
rename to llvm/test/tools/obj2yaml/ELF/section-type.yaml
diff --git a/llvm/test/tools/obj2yaml/sections-info.yaml b/llvm/test/tools/obj2yaml/ELF/sections-info.yaml
rename from llvm/test/tools/obj2yaml/sections-info.yaml
rename to llvm/test/tools/obj2yaml/ELF/sections-info.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-shinfo.yaml b/llvm/test/tools/obj2yaml/ELF/shinfo.yaml
rename from llvm/test/tools/obj2yaml/elf-shinfo.yaml
rename to llvm/test/tools/obj2yaml/ELF/shinfo.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-shlink.yaml b/llvm/test/tools/obj2yaml/ELF/shlink.yaml
rename from llvm/test/tools/obj2yaml/elf-shlink.yaml
rename to llvm/test/tools/obj2yaml/ELF/shlink.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-sht-symtab-shndx.yaml b/llvm/test/tools/obj2yaml/ELF/sht-symtab-shndx.yaml
rename from llvm/test/tools/obj2yaml/elf-sht-symtab-shndx.yaml
rename to llvm/test/tools/obj2yaml/ELF/sht-symtab-shndx.yaml
diff --git a/llvm/test/tools/obj2yaml/special-symbol-indices.yaml b/llvm/test/tools/obj2yaml/ELF/special-symbol-indices.yaml
rename from llvm/test/tools/obj2yaml/special-symbol-indices.yaml
rename to llvm/test/tools/obj2yaml/ELF/special-symbol-indices.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-stack-sizes.yaml b/llvm/test/tools/obj2yaml/ELF/stack-sizes.yaml
rename from llvm/test/tools/obj2yaml/elf-stack-sizes.yaml
rename to llvm/test/tools/obj2yaml/ELF/stack-sizes.yaml
diff --git a/llvm/test/tools/obj2yaml/symbol-type.yaml b/llvm/test/tools/obj2yaml/ELF/symbol-type.yaml
rename from llvm/test/tools/obj2yaml/symbol-type.yaml
rename to llvm/test/tools/obj2yaml/ELF/symbol-type.yaml
diff --git a/llvm/test/tools/obj2yaml/elf-symbol-visibility.yaml b/llvm/test/tools/obj2yaml/ELF/symbol-visibility.yaml
rename from llvm/test/tools/obj2yaml/elf-symbol-visibility.yaml
rename to llvm/test/tools/obj2yaml/ELF/symbol-visibility.yaml
diff --git a/llvm/test/tools/obj2yaml/verdef-section.yaml b/llvm/test/tools/obj2yaml/ELF/verdef-section.yaml
rename from llvm/test/tools/obj2yaml/verdef-section.yaml
rename to llvm/test/tools/obj2yaml/ELF/verdef-section.yaml
diff --git a/llvm/test/tools/obj2yaml/verneed-section.yaml b/llvm/test/tools/obj2yaml/ELF/verneed-section.yaml
rename from llvm/test/tools/obj2yaml/verneed-section.yaml
rename to llvm/test/tools/obj2yaml/ELF/verneed-section.yaml
diff --git a/llvm/test/tools/obj2yaml/versym-section.yaml b/llvm/test/tools/obj2yaml/ELF/versym-section.yaml
rename from llvm/test/tools/obj2yaml/versym-section.yaml
rename to llvm/test/tools/obj2yaml/ELF/versym-section.yaml
diff --git a/llvm/test/tools/obj2yaml/macho-DWARF-debug_aranges-error.yaml b/llvm/test/tools/obj2yaml/MachO/DWARF-debug_aranges-error.yaml
rename from llvm/test/tools/obj2yaml/macho-DWARF-debug_aranges-error.yaml
rename to llvm/test/tools/obj2yaml/MachO/DWARF-debug_aranges-error.yaml
diff --git a/llvm/test/tools/obj2yaml/basic-minidump.yaml b/llvm/test/tools/obj2yaml/Minidump/basic.yaml
rename from llvm/test/tools/obj2yaml/basic-minidump.yaml
rename to llvm/test/tools/obj2yaml/Minidump/basic.yaml
diff --git a/llvm/test/tools/obj2yaml/Inputs/aix_xcoff.o b/llvm/test/tools/obj2yaml/XCOFF/Inputs/aix_xcoff.o
rename from llvm/test/tools/obj2yaml/Inputs/aix_xcoff.o
rename to llvm/test/tools/obj2yaml/XCOFF/Inputs/aix_xcoff.o
diff --git a/llvm/test/tools/obj2yaml/Inputs/aix_xcoff_truncated_file_header.o b/llvm/test/tools/obj2yaml/XCOFF/Inputs/aix_xcoff_truncated_file_header.o
rename from llvm/test/tools/obj2yaml/Inputs/aix_xcoff_truncated_file_header.o
rename to llvm/test/tools/obj2yaml/XCOFF/Inputs/aix_xcoff_truncated_file_header.o
diff --git a/llvm/test/tools/obj2yaml/aix_xcoff.test b/llvm/test/tools/obj2yaml/XCOFF/aix.yaml
rename from llvm/test/tools/obj2yaml/aix_xcoff.test
rename to llvm/test/tools/obj2yaml/XCOFF/aix.yaml
diff --git a/llvm/test/tools/obj2yaml/aix_xcoff_truncated_file_header.test b/llvm/test/tools/obj2yaml/XCOFF/truncated-file-header.yaml
rename from llvm/test/tools/obj2yaml/aix_xcoff_truncated_file_header.test
rename to llvm/test/tools/obj2yaml/XCOFF/truncated-file-header.yaml