Index: llvm/trunk/test/tools/llvm-objcopy/help-message.test
===================================================================
--- llvm/trunk/test/tools/llvm-objcopy/help-message.test
+++ llvm/trunk/test/tools/llvm-objcopy/help-message.test
@@ -1,8 +1,15 @@
-# RUN: llvm-objcopy --help | FileCheck --check-prefix=CHECK-OBJCOPY %s
-# RUN: not llvm-objcopy 2>&1 | FileCheck --check-prefix=CHECK-OBJCOPY %s
+# RUN: llvm-objcopy --help | FileCheck --check-prefix=OBJCOPY-USAGE %s
+# RUN: not llvm-objcopy 2>&1 | FileCheck --check-prefix=OBJCOPY-USAGE %s
+# RUN: not llvm-objcopy -abcabc 2>&1 | FileCheck --check-prefix=UNKNOWN-ARG %s
+# RUN: not llvm-objcopy -strip-debug 2>&1 | FileCheck %s --check-prefix=NO-INPUT-FILES
 
-# RUN: llvm-strip --help | FileCheck --check-prefix=CHECK-STRIP %s
-# RUN: not llvm-strip 2>&1 | FileCheck --check-prefix=CHECK-STRIP %s
+# RUN: llvm-strip --help | FileCheck --check-prefix=STRIP-USAGE %s
+# RUN: not llvm-strip 2>&1 | FileCheck --check-prefix=STRIP-USAGE %s
+# RUN: not llvm-strip -abcabc 2>&1 | FileCheck --check-prefix=UNKNOWN-ARG %s
+# RUN: not llvm-strip -strip-debug 2>&1 | FileCheck %s --check-prefix=NO-INPUT-FILES
 
-# CHECK-OBJCOPY: USAGE: llvm-objcopy
-# CHECK-STRIP:   USAGE: llvm-strip
+
+# OBJCOPY-USAGE:  USAGE: llvm-objcopy
+# STRIP-USAGE:    USAGE: llvm-strip
+# UNKNOWN-ARG:    unknown argument '-abcabc'
+# NO-INPUT-FILES: No input file specified
Index: llvm/trunk/test/tools/llvm-objcopy/strip-debug.test
===================================================================
--- llvm/trunk/test/tools/llvm-objcopy/strip-debug.test
+++ llvm/trunk/test/tools/llvm-objcopy/strip-debug.test
@@ -10,8 +10,6 @@
 # RUN: llvm-readobj -file-headers -sections -symbols %t3 | FileCheck %s
 # RUN: cmp %t2 %t3
 
-# RUN: not llvm-strip -strip-debug 2>&1 | FileCheck %s --check-prefix=NO-INPUT-FILES
-
 !ELF
 FileHeader:
   Class:           ELFCLASS64
@@ -62,5 +60,3 @@
 # CHECK-NEXT:     Section: .text
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
-
-# NO-INPUT-FILES: No input file specified