diff --git a/clang/test/Analysis/scan-build/exclude_directories.test b/clang/test/Analysis/scan-build/exclude_directories.test
--- a/clang/test/Analysis/scan-build/exclude_directories.test
+++ b/clang/test/Analysis/scan-build/exclude_directories.test
@@ -5,7 +5,7 @@
 UNSUPPORTED: system-windows
 
 RUN: rm -rf %t.output_dir && mkdir %t.output_dir
-RUN: %scan-build -o %t.output_dir %clang -c \
+RUN: %scan-build -o %t.output_dir %clang -S \
 RUN:     %S/Inputs/multidirectory_project/directory1/file1.c \
 RUN:     %S/Inputs/multidirectory_project/directory2/file2.c \
 RUN:     | FileCheck %s -check-prefix CHECK-NO-EXCLUDE
@@ -21,7 +21,7 @@
 
 // Only one issue should be found when directory1 is excluded.
 RUN: rm -rf %t.output_dir && mkdir %t.output_dir
-RUN: %scan-build -o %t.output_dir --exclude directory1 %clang -c \
+RUN: %scan-build -o %t.output_dir --exclude directory1 %clang -S \
 RUN:     %S/Inputs/multidirectory_project/directory1/file1.c \
 RUN:     %S/Inputs/multidirectory_project/directory2/file2.c \
 RUN:     | FileCheck %s -check-prefix CHECK-EXCLUDE1
@@ -31,7 +31,7 @@
 
 // When both directories are excluded, no issues should be reported.
 RUN: rm -rf %t.output_dir && mkdir %t.output_dir
-RUN: %scan-build -o %t.output_dir --exclude directory1 --exclude directory2 %clang -c \
+RUN: %scan-build -o %t.output_dir --exclude directory1 --exclude directory2 %clang -S \
 RUN:     %S/Inputs/multidirectory_project/directory1/file1.c \
 RUN:     %S/Inputs/multidirectory_project/directory2/file2.c \
 RUN:     | FileCheck %s -check-prefix CHECK-EXCLUDE-BOTH
diff --git a/clang/test/Analysis/scan-build/html_output.test b/clang/test/Analysis/scan-build/html_output.test
--- a/clang/test/Analysis/scan-build/html_output.test
+++ b/clang/test/Analysis/scan-build/html_output.test
@@ -5,7 +5,7 @@
 UNSUPPORTED: system-windows
 
 RUN: rm -rf %t.output_dir && mkdir %t.output_dir
-RUN: %scan-build -o %t.output_dir %clang -c %S/Inputs/single_null_dereference.c \
+RUN: %scan-build -o %t.output_dir %clang -S %S/Inputs/single_null_dereference.c \
 RUN:     | FileCheck %s -check-prefix CHECK-STDOUT
 
 // Test html output
diff --git a/clang/test/Analysis/scan-build/plist_html_output.test b/clang/test/Analysis/scan-build/plist_html_output.test
--- a/clang/test/Analysis/scan-build/plist_html_output.test
+++ b/clang/test/Analysis/scan-build/plist_html_output.test
@@ -5,7 +5,7 @@
 UNSUPPORTED: system-windows
 
 RUN: rm -rf %t.output_dir && mkdir %t.output_dir
-RUN: %scan-build -plist-html -o %t.output_dir %clang -c %S/Inputs/single_null_dereference.c \
+RUN: %scan-build -plist-html -o %t.output_dir %clang -S %S/Inputs/single_null_dereference.c \
 RUN:     | FileCheck %s -check-prefix CHECK-STDOUT
 
 // Test combined plist and html output with -plist-html
diff --git a/clang/test/Analysis/scan-build/plist_output.test b/clang/test/Analysis/scan-build/plist_output.test
--- a/clang/test/Analysis/scan-build/plist_output.test
+++ b/clang/test/Analysis/scan-build/plist_output.test
@@ -5,7 +5,7 @@
 UNSUPPORTED: system-windows
 
 RUN: rm -rf %t.output_dir && mkdir %t.output_dir
-RUN: %scan-build -plist -o %t.output_dir %clang -c %S/Inputs/single_null_dereference.c \
+RUN: %scan-build -plist -o %t.output_dir %clang -S %S/Inputs/single_null_dereference.c \
 RUN:     | FileCheck %s -check-prefix CHECK-STDOUT
 
 // Test plist output