diff --git a/llvm/test/tools/llvm-objcopy/ELF/objcopy-version.test b/llvm/test/tools/llvm-objcopy/ELF/objcopy-version.test
deleted file mode 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/objcopy-version.test
+++ /dev/null
@@ -1,4 +0,0 @@
-# RUN: llvm-objcopy --version | FileCheck %s
-# RUN: llvm-objcopy -V | FileCheck %s
-
-# CHECK: {{ version }}
diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-version.test b/llvm/test/tools/llvm-objcopy/ELF/strip-version.test
deleted file mode 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/strip-version.test
+++ /dev/null
@@ -1,5 +0,0 @@
-# RUN: llvm-strip --version | FileCheck %s
-# RUN: llvm-strip -V | FileCheck %s
-
-# CHECK-DAG: {{ version }}
-# CHECK-DAG: GNU strip
diff --git a/llvm/test/tools/llvm-objcopy/MachO/install-name-tool-version.test b/llvm/test/tools/llvm-objcopy/MachO/install-name-tool-version.test
deleted file mode 100644
--- a/llvm/test/tools/llvm-objcopy/MachO/install-name-tool-version.test
+++ /dev/null
@@ -1,2 +0,0 @@
-# RUN: llvm-install-name-tool --version | FileCheck %s
-# CHECK: {{ version }}
diff --git a/llvm/test/tools/llvm-objcopy/tool-version.test b/llvm/test/tools/llvm-objcopy/tool-version.test
new file mode 100644
--- /dev/null
+++ b/llvm/test/tools/llvm-objcopy/tool-version.test
@@ -0,0 +1,15 @@
+# RUN: llvm-objcopy --version | FileCheck --check-prefix=OBJCOPY %s
+# RUN: llvm-objcopy -V | FileCheck --check-prefix=OBJCOPY %s
+
+# RUN: llvm-strip --version | FileCheck --check-prefix=STRIP %s
+# RUN: llvm-strip -V | FileCheck --check-prefix=STRIP %s
+
+# RUN: llvm-install-name-tool --version | FileCheck %s
+
+# OBJCOPY-DAG: {{ version }}
+# OBJCOPY-DAG: GNU objcopy
+
+# STRIP-DAG: {{ version }}
+# STRIP-DAG: GNU strip
+
+# CHECK: {{ version }}