diff --git a/llvm/test/tools/llvm-objdump/ARM/lit.local.cfg b/llvm/test/tools/llvm-objdump/ARM/lit.local.cfg
new file mode 100644
index 000000000000..236e1d344166
--- /dev/null
+++ b/llvm/test/tools/llvm-objdump/ARM/lit.local.cfg
@@ -0,0 +1,2 @@
+if not 'ARM' in config.root.targets:
+    config.unsupported = True
diff --git a/llvm/test/tools/llvm-objdump/macho-mattr-arm.test b/llvm/test/tools/llvm-objdump/ARM/macho-mattr-arm.test
similarity index 100%
rename from llvm/test/tools/llvm-objdump/macho-mattr-arm.test
rename to llvm/test/tools/llvm-objdump/ARM/macho-mattr-arm.test
diff --git a/llvm/test/tools/llvm-objdump/macho-mcpu-arm.test b/llvm/test/tools/llvm-objdump/ARM/macho-mcpu-arm.test
similarity index 100%
rename from llvm/test/tools/llvm-objdump/macho-mcpu-arm.test
rename to llvm/test/tools/llvm-objdump/ARM/macho-mcpu-arm.test
diff --git a/llvm/test/tools/llvm-objdump/Inputs/out-of-section-sym.elf-i386 b/llvm/test/tools/llvm-objdump/X86/Inputs/out-of-section-sym.elf-i386
similarity index 100%
rename from llvm/test/tools/llvm-objdump/Inputs/out-of-section-sym.elf-i386
rename to llvm/test/tools/llvm-objdump/X86/Inputs/out-of-section-sym.elf-i386
diff --git a/llvm/test/tools/llvm-objdump/Inputs/trivial.obj.elf-i386 b/llvm/test/tools/llvm-objdump/X86/Inputs/trivial.obj.elf-i386
similarity index 100%
rename from llvm/test/tools/llvm-objdump/Inputs/trivial.obj.elf-i386
rename to llvm/test/tools/llvm-objdump/X86/Inputs/trivial.obj.elf-i386
diff --git a/llvm/test/tools/llvm-objdump/disassembly-show-raw.test b/llvm/test/tools/llvm-objdump/X86/disassembly-show-raw.test
similarity index 100%
rename from llvm/test/tools/llvm-objdump/disassembly-show-raw.test
rename to llvm/test/tools/llvm-objdump/X86/disassembly-show-raw.test
diff --git a/llvm/test/tools/llvm-objdump/lit.local.cfg b/llvm/test/tools/llvm-objdump/X86/lit.local.cfg
similarity index 100%
rename from llvm/test/tools/llvm-objdump/lit.local.cfg
rename to llvm/test/tools/llvm-objdump/X86/lit.local.cfg
diff --git a/llvm/test/tools/llvm-objdump/out-of-section-sym.test b/llvm/test/tools/llvm-objdump/X86/out-of-section-sym.test
similarity index 100%
rename from llvm/test/tools/llvm-objdump/out-of-section-sym.test
rename to llvm/test/tools/llvm-objdump/X86/out-of-section-sym.test