diff --git a/llvm/test/Object/COFF/i386.yaml b/llvm/test/Object/Inputs/COFF/i386.yaml
similarity index 100%
rename from llvm/test/Object/COFF/i386.yaml
rename to llvm/test/Object/Inputs/COFF/i386.yaml
diff --git a/llvm/test/Object/COFF/x86-64.yaml b/llvm/test/Object/Inputs/COFF/x86-64.yaml
similarity index 100%
rename from llvm/test/Object/COFF/x86-64.yaml
rename to llvm/test/Object/Inputs/COFF/x86-64.yaml
diff --git a/llvm/test/Object/nm-trivial-object.test b/llvm/test/Object/nm-trivial-object.test
index b6f70a02a7a5..8fd1c0482de9 100644
--- a/llvm/test/Object/nm-trivial-object.test
+++ b/llvm/test/Object/nm-trivial-object.test
@@ -1,5 +1,7 @@
-RUN: yaml2obj %p/COFF/i386.yaml | llvm-nm | FileCheck %s -check-prefix COFF
-RUN: yaml2obj %p/COFF/x86-64.yaml | llvm-nm | FileCheck %s -check-prefix COFF
+RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-nm \
+RUN:         | FileCheck %s -check-prefix COFF
+RUN: yaml2obj %p/Inputs/COFF/x86-64.yaml | llvm-nm \
+RUN          | FileCheck %s -check-prefix COFF
 RUN: llvm-nm %p/Inputs/trivial-object-test.elf-i386 \
 RUN:         | FileCheck %s -check-prefix ELF
 RUN: llvm-nm %p/Inputs/trivial-object-test.elf-x86-64 \
diff --git a/llvm/test/Object/objdump-file-header.test b/llvm/test/Object/objdump-file-header.test
index f35a8a1fa202..a552113d3253 100644
--- a/llvm/test/Object/objdump-file-header.test
+++ b/llvm/test/Object/objdump-file-header.test
@@ -1,4 +1,4 @@
-RUN: yaml2obj %p/COFF/i386.yaml | llvm-objdump -f - | FileCheck %s -check-prefix COFF-i386
+RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-objdump -f - | FileCheck %s -check-prefix COFF-i386
 RUN: llvm-objdump -f %p/Inputs/trivial-object-test.elf-i386 \
 RUN:              | FileCheck %s -check-prefix ELF-i386
 
diff --git a/llvm/test/Object/objdump-section-content.test b/llvm/test/Object/objdump-section-content.test
index 56b7989a605c..f9c4f43f0be0 100644
--- a/llvm/test/Object/objdump-section-content.test
+++ b/llvm/test/Object/objdump-section-content.test
@@ -1,4 +1,4 @@
-RUN: yaml2obj %p/COFF/i386.yaml | llvm-objdump -s - | FileCheck %s -check-prefix COFF-i386
+RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-objdump -s - | FileCheck %s -check-prefix COFF-i386
 RUN: llvm-objdump -s %p/Inputs/trivial-object-test.elf-i386 \
 RUN:              | FileCheck %s -check-prefix ELF-i386
 
diff --git a/llvm/test/Object/objdump-symbol-table.test b/llvm/test/Object/objdump-symbol-table.test
index a721171c094f..989ec04a8ddc 100644
--- a/llvm/test/Object/objdump-symbol-table.test
+++ b/llvm/test/Object/objdump-symbol-table.test
@@ -1,4 +1,4 @@
-RUN: yaml2obj %p/COFF/i386.yaml | llvm-objdump -t - \
+RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-objdump -t - \
 RUN:              | FileCheck %s -check-prefix COFF-i386
 RUN: llvm-objdump -t %p/Inputs/trivial-object-test.elf-i386 \
 RUN:              | FileCheck %s -check-prefix ELF-i386
@@ -30,4 +30,4 @@ macho-i386: trivial-object-test.macho-i386:        file format Mach-O 32-bit i38
 macho-i386: SYMBOL TABLE:
 macho-i386: 00000000 g     F __TEXT,__text  00000024 _main
 macho-i386: 00000000         *UND*  00000000 _SomeOtherFunction
-macho-i386: 00000000         *UND*  00000000 _puts
\ No newline at end of file
+macho-i386: 00000000         *UND*  00000000 _puts