diff --git a/llvm/test/Object/Inputs/tapi-invalid-v1.tbd b/llvm/test/tools/llvm-nm/Inputs/tapi-invalid-v1.tbd
rename from llvm/test/Object/Inputs/tapi-invalid-v1.tbd
rename to llvm/test/tools/llvm-nm/Inputs/tapi-invalid-v1.tbd
diff --git a/llvm/test/Object/Inputs/tapi-invalid-v2.tbd b/llvm/test/tools/llvm-nm/Inputs/tapi-invalid-v2.tbd
rename from llvm/test/Object/Inputs/tapi-invalid-v2.tbd
rename to llvm/test/tools/llvm-nm/Inputs/tapi-invalid-v2.tbd
diff --git a/llvm/test/Object/Inputs/tapi-invalid-v3.tbd b/llvm/test/tools/llvm-nm/Inputs/tapi-invalid-v3.tbd
rename from llvm/test/Object/Inputs/tapi-invalid-v3.tbd
rename to llvm/test/tools/llvm-nm/Inputs/tapi-invalid-v3.tbd
diff --git a/llvm/test/Object/Inputs/tapi-v1.tbd b/llvm/test/tools/llvm-nm/Inputs/tapi-v1.tbd
rename from llvm/test/Object/Inputs/tapi-v1.tbd
rename to llvm/test/tools/llvm-nm/Inputs/tapi-v1.tbd
diff --git a/llvm/test/Object/Inputs/tapi-v2.tbd b/llvm/test/tools/llvm-nm/Inputs/tapi-v2.tbd
rename from llvm/test/Object/Inputs/tapi-v2.tbd
rename to llvm/test/tools/llvm-nm/Inputs/tapi-v2.tbd
diff --git a/llvm/test/Object/Inputs/tapi-v3.tbd b/llvm/test/tools/llvm-nm/Inputs/tapi-v3.tbd
rename from llvm/test/Object/Inputs/tapi-v3.tbd
rename to llvm/test/tools/llvm-nm/Inputs/tapi-v3.tbd
diff --git a/llvm/test/Object/Inputs/tapi-v4-watchos.tbd b/llvm/test/tools/llvm-nm/Inputs/tapi-v4-watchos.tbd
rename from llvm/test/Object/Inputs/tapi-v4-watchos.tbd
rename to llvm/test/tools/llvm-nm/Inputs/tapi-v4-watchos.tbd
diff --git a/llvm/test/Object/Inputs/tapi-v4.tbd b/llvm/test/tools/llvm-nm/Inputs/tapi-v4.tbd
rename from llvm/test/Object/Inputs/tapi-v4.tbd
rename to llvm/test/tools/llvm-nm/Inputs/tapi-v4.tbd
diff --git a/llvm/test/Object/Inputs/tapi-v5.tbd b/llvm/test/tools/llvm-nm/Inputs/tapi-v5.tbd
rename from llvm/test/Object/Inputs/tapi-v5.tbd
rename to llvm/test/tools/llvm-nm/Inputs/tapi-v5.tbd
diff --git a/llvm/test/Object/nm-tapi-invalids.test b/llvm/test/tools/llvm-nm/invalid-tapi-files.test
rename from llvm/test/Object/nm-tapi-invalids.test
rename to llvm/test/tools/llvm-nm/invalid-tapi-files.test
diff --git a/llvm/test/Object/nm-tapi.test b/llvm/test/tools/llvm-nm/tapi-files.test
rename from llvm/test/Object/nm-tapi.test
rename to llvm/test/tools/llvm-nm/tapi-files.test