diff --git a/clang/test/Analysis/html-diags.c b/clang/test/Analysis/html-diags.c
index 59d81a56a4e9..b9361f72c64c 100644
--- a/clang/test/Analysis/html-diags.c
+++ b/clang/test/Analysis/html-diags.c
@@ -1,5 +1,5 @@
 // RUN: mkdir %t.dir
-// RUN: %clang_cc1 -analyze -analyzer-output=html -analyzer-checker=core -o %T.dir %s
+// RUN: %clang_cc1 -analyze -analyzer-output=html -analyzer-checker=core -o %t.dir %s
 // RUN: rm -fR %t.dir
 
 // Currently this test mainly checks that the HTML diagnostics doesn't crash
diff --git a/clang/test/Driver/debug-options.c b/clang/test/Driver/debug-options.c
index bdeb6cad918f..ca77abf9fd30 100644
--- a/clang/test/Driver/debug-options.c
+++ b/clang/test/Driver/debug-options.c
@@ -20,7 +20,7 @@
 // RUN: %clang -### -c -gline-tables-only -g0 %s 2>&1 \
 // RUN:             | FileCheck -check-prefix=GLTO_NO %s
 //
-// RUN: %clang -c -grecord-gcc-switches -gno-record-gcc-switches \
+// RUN: %clang -### -c -grecord-gcc-switches -gno-record-gcc-switches \
 // RUN:           -gstrict-dwarf -gno-strict-dwarf %s 2>&1 \
 // RUN:        | not grep "argument unused during compilation"
 //
diff --git a/clang/test/Driver/warning-options.cpp b/clang/test/Driver/warning-options.cpp
index ce434ab006ed..ab0da42e4bfc 100644
--- a/clang/test/Driver/warning-options.cpp
+++ b/clang/test/Driver/warning-options.cpp
@@ -3,7 +3,7 @@
 // RUN: %clang -### -Wlarge-by-value-copy=128 %s 2>&1 | FileCheck -check-prefix=LARGE_VALUE_COPY_JOINED %s
 // LARGE_VALUE_COPY_JOINED: -Wlarge-by-value-copy=128
 
-// RUN: %clang -c -Wmonkey -Wno-monkey -Wno-unused-command-line-arguments \
+// RUN: %clang -### -c -Wmonkey -Wno-monkey -Wno-unused-command-line-arguments \
 // RUN:        -Wno-unused-command-line-argument %s 2>&1 | FileCheck %s
 // CHECK: unknown warning option '-Wmonkey'
 // CHECK: unknown warning option '-Wno-monkey'