diff --git a/clang/test/Driver/print-effective-triple.c b/clang/test/Driver/print-effective-triple.c
--- a/clang/test/Driver/print-effective-triple.c
+++ b/clang/test/Driver/print-effective-triple.c
@@ -1,6 +1,6 @@
 // Test that -print-target-triple prints correct triple.
 
-// RUN: %clang -print-effective-triple 2>&1 \
-// RUN:     --target=thumb-linux-gnu \
+// RUN: %clang -print-effective-triple \
+// RUN:     --target=thumb-linux-gnu 2>&1 \
 // RUN:   | FileCheck %s
 // CHECK: armv4t-unknown-linux-gnu
diff --git a/clang/test/Driver/print-file-name.c b/clang/test/Driver/print-file-name.c
--- a/clang/test/Driver/print-file-name.c
+++ b/clang/test/Driver/print-file-name.c
@@ -1,19 +1,19 @@
 // Test that -print-file-name finds the correct file.
 
-// RUN: %clang -print-file-name=share/asan_ignorelist.txt 2>&1 \
+// RUN: %clang -print-file-name=share/asan_ignorelist.txt \
 // RUN:     -resource-dir=%S/Inputs/resource_dir \
-// RUN:     --target=x86_64-unknown-linux-gnu \
+// RUN:     --target=x86_64-unknown-linux-gnu 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-RESOURCE-DIR %s
 // CHECK-RESOURCE-DIR: resource_dir{{/|\\}}share{{/|\\}}asan_ignorelist.txt
 
-// RUN: %clang -print-file-name=libclang_rt.builtins.a 2>&1 \
+// RUN: %clang -print-file-name=libclang_rt.builtins.a \
 // RUN:     -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
-// RUN:     --target=x86_64-unknown-linux-gnu \
+// RUN:     --target=x86_64-unknown-linux-gnu 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-COMPILER-RT %s
 // CHECK-COMPILER-RT: resource_dir_with_per_target_subdir{{/|\\}}lib{{/|\\}}x86_64-unknown-linux-gnu{{/|\\}}libclang_rt.builtins.a
 
-// RUN: %clang -print-file-name=include/c++/v1 2>&1 \
+// RUN: %clang -print-file-name=include/c++/v1 \
 // RUN:     -ccc-install-dir %S/Inputs/basic_linux_libcxx_tree/usr/bin \
-// RUN:     --target=x86_64-unknown-linux-gnu \
+// RUN:     --target=x86_64-unknown-linux-gnu 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-INSTALL-DIR %s
 // CHECK-INSTALL-DIR: basic_linux_libcxx_tree{{/|\\}}usr{{/|\\}}bin{{/|\\}}..{{/|\\}}include{{/|\\}}c++{{/|\\}}v1
diff --git a/clang/test/Driver/print-libgcc-file-name-clangrt.c b/clang/test/Driver/print-libgcc-file-name-clangrt.c
--- a/clang/test/Driver/print-libgcc-file-name-clangrt.c
+++ b/clang/test/Driver/print-libgcc-file-name-clangrt.c
@@ -1,65 +1,65 @@
 // Test that -print-libgcc-file-name correctly respects -rtlib=compiler-rt.
 
-// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \
+// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name \
 // RUN:     --target=x86_64-pc-linux \
 // RUN:     --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
-// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
+// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-CLANGRT-X8664 %s
 // CHECK-CLANGRT-X8664: libclang_rt.builtins-x86_64.a
 
-// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \
+// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name \
 // RUN:     --target=i386-pc-linux \
 // RUN:     --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
-// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
+// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-CLANGRT-I386 %s
 // CHECK-CLANGRT-I386: libclang_rt.builtins-i386.a
 
 // Check whether alternate arch values map to the correct library.
 //
-// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \
+// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name \
 // RUN:     --target=i686-pc-linux \
 // RUN:     --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
-// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
+// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-CLANGRT-I386 %s
 
-// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \
+// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name \
 // RUN:     --target=arm-linux-gnueabi \
 // RUN:     --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
-// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
+// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-CLANGRT-ARM %s
 // CHECK-CLANGRT-ARM: libclang_rt.builtins-arm.a
 
-// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \
+// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name \
 // RUN:     --target=arm-linux-androideabi \
 // RUN:     --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
-// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
+// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-CLANGRT-ARM-ANDROID %s
 // CHECK-CLANGRT-ARM-ANDROID: libclang_rt.builtins-arm-android.a
 
-// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \
+// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name \
 // RUN:     --target=arm-linux-gnueabihf \
 // RUN:     --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
-// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
+// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-CLANGRT-ARMHF %s
 // CHECK-CLANGRT-ARMHF: libclang_rt.builtins-armhf.a
 
-// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \
+// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name \
 // RUN:     --target=arm-linux-gnueabi -mfloat-abi=hard \
 // RUN:     --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
-// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
+// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-CLANGRT-ARM-ABI %s
 // CHECK-CLANGRT-ARM-ABI: libclang_rt.builtins-armhf.a
 
-// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \
+// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name \
 // RUN:     --target=armv7m-none-eabi \
 // RUN:     --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
-// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
+// RUN:     -resource-dir=%S/Inputs/resource_dir_with_arch_subdir 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-CLANGRT-ARM-BAREMETAL %s
 // CHECK-CLANGRT-ARM-BAREMETAL: libclang_rt.builtins-armv7m.a
 
-// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \
+// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name \
 // RUN:     --target=armv7m-vendor-none-eabi \
 // RUN:     --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
-// RUN:     -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
+// RUN:     -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-CLANGRT-ARM-BAREMETAL-PER-TARGET %s
 // CHECK-CLANGRT-ARM-BAREMETAL-PER-TARGET: libclang_rt.builtins.a
diff --git a/clang/test/Driver/print-multi-directory.c b/clang/test/Driver/print-multi-directory.c
--- a/clang/test/Driver/print-multi-directory.c
+++ b/clang/test/Driver/print-multi-directory.c
@@ -1,27 +1,27 @@
-// RUN: %clang -### %s 2>/dev/null \
+// RUN: %clang -### %s \
 // RUN:     --target=i386-none-linux \
 // RUN:     --sysroot=%S/Inputs/multilib_64bit_linux_tree/usr \
-// RUN:     -print-multi-directory \
+// RUN:     -print-multi-directory 2>/dev/null \
 // RUN:   | FileCheck --match-full-lines --check-prefix=CHECK-X86-MULTILIBS %s
 
 // CHECK-X86-MULTILIBS:      32
 // CHECK-X86-MULTILIBS-NOT:  {{^.+$}}
 
-// RUN: %clang -### %s 2>/dev/null \
+// RUN: %clang -### %s \
 // RUN:     --target=i386-none-linux -m64 \
 // RUN:     --sysroot=%S/Inputs/multilib_64bit_linux_tree/usr \
-// RUN:     -print-multi-directory \
+// RUN:     -print-multi-directory 2>/dev/null \
 // RUN:   | FileCheck --match-full-lines --check-prefix=CHECK-X86_64-MULTILIBS %s
 
 // CHECK-X86_64-MULTILIBS:      .
 // CHECK-X86_64-MULTILIBS-NOT:  {{^.+$}}
 
-// RUN: %clang -### %s 2>/dev/null \
+// RUN: %clang -### %s \
 // RUN:     --target=arm-linux-androideabi21 \
 // RUN:     -mthumb \
 // RUN:     --gcc-toolchain=%S/Inputs/basic_android_ndk_tree \
 // RUN:     --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
-// RUN:     -print-multi-directory \
+// RUN:     -print-multi-directory 2>/dev/null \
 // RUN:   | FileCheck --match-full-lines --check-prefix=CHECK-ARM-MULTILIBS %s
 
 // CHECK-ARM-MULTILIBS:      thumb
diff --git a/clang/test/Driver/print-target-triple.c b/clang/test/Driver/print-target-triple.c
--- a/clang/test/Driver/print-target-triple.c
+++ b/clang/test/Driver/print-target-triple.c
@@ -1,6 +1,6 @@
 // Test that -print-target-triple prints correct triple.
 
-// RUN: %clang -print-target-triple 2>&1 \
-// RUN:     --target=x86_64-linux-gnu \
+// RUN: %clang -print-target-triple \
+// RUN:     --target=x86_64-linux-gnu 2>&1 \
 // RUN:   | FileCheck %s
 // CHECK: x86_64-unknown-linux-gnu