diff --git a/clang/test/Driver/lanai-unknown-unknown.cpp b/clang/test/Driver/lanai-unknown-unknown.cpp
index 220a84f9eb2de..103ccabab0d30 100644
--- a/clang/test/Driver/lanai-unknown-unknown.cpp
+++ b/clang/test/Driver/lanai-unknown-unknown.cpp
@@ -1,6 +1,6 @@
-// RUN: %clang -target lanai-unknown-unknown -### %s -emit-llvm-only -c 2>&1 \
+// RUN: %clang --target=lanai-unknown-unknown -### %s -c 2>&1 \
 // RUN:   | FileCheck %s -check-prefix=ECHO
-// RUN: %clang -target lanai-unknown-unknown %s -emit-llvm -S -o - \
+// RUN: %clang --target=lanai-unknown-unknown %s -emit-llvm -S -o - \
 // RUN:   | FileCheck %s
 
 // ECHO: {{.*}} "-cc1" {{.*}}lanai-unknown-unknown.c
diff --git a/clang/test/Driver/mipsel-nacl-defines.cpp b/clang/test/Driver/mipsel-nacl-defines.cpp
deleted file mode 100644
index 0f63d7659e518..0000000000000
--- a/clang/test/Driver/mipsel-nacl-defines.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// RUN: %clang -target mipsel-unknown-nacl -### %s -emit-llvm-only -c -o %t.o 2>&1 | FileCheck %s -check-prefix=ECHO
-// RUN: %clang -target mipsel-unknown-nacl %s -emit-llvm -S -c -o - | FileCheck %s
-// RUN: %clang -target mipsel-unknown-nacl %s -emit-llvm -S -c -pthread -o - | FileCheck %s -check-prefix=THREADS
-
-// ECHO: {{.*}} "-cc1" {{.*}}mipsel-nacl-defines.c
-
-// Check platform defines
-
-// CHECK: _MIPSELdefined
-#ifdef _MIPSEL
-void _MIPSELdefined() {}
-#endif
-
-// CHECK: _mipsdefined
-#ifdef _mips
-void _mipsdefined() {}
-#endif
-
-// CHECK: __native_client__defined
-#ifdef __native_client__
-void __native_client__defined() {}
-#endif
-
-// CHECK: unixdefined
-#ifdef unix
-void unixdefined() {}
-#endif
-
-// CHECK: __ELF__defined
-#ifdef __ELF__
-void __ELF__defined() {}
-#endif
-
-// CHECK: _GNU_SOURCEdefined
-#ifdef _GNU_SOURCE
-void _GNU_SOURCEdefined() {}
-#endif
-
-// THREADS: _REENTRANTdefined
-// CHECK: _REENTRANTundefined
-#ifdef _REENTRANT
-void _REENTRANTdefined() {}
-#else
-void _REENTRANTundefined() {}
-#endif
diff --git a/clang/test/Driver/wasm32-unknown-unknown.cpp b/clang/test/Driver/wasm32-unknown-unknown.cpp
index 90b58503faf9a..73b015c39f4af 100644
--- a/clang/test/Driver/wasm32-unknown-unknown.cpp
+++ b/clang/test/Driver/wasm32-unknown-unknown.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang -target wasm32-unknown-unknown -### %s -emit-llvm-only -c 2>&1 \
+// RUN: %clang --target=wasm32-unknown-unknown -### %s -c 2>&1 \
 // RUN:   | FileCheck %s -check-prefix=ECHO
 // RUN: %clang -target wasm32-unknown-unknown %s -emit-llvm -S -o - \
 // RUN:   | FileCheck %s
diff --git a/clang/test/Driver/wasm64-unknown-unknown.cpp b/clang/test/Driver/wasm64-unknown-unknown.cpp
index 9ee4a1b566d02..25d382cb64d1e 100644
--- a/clang/test/Driver/wasm64-unknown-unknown.cpp
+++ b/clang/test/Driver/wasm64-unknown-unknown.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang -target wasm64-unknown-unknown -### %s -emit-llvm-only -c 2>&1 \
+// RUN: %clang --target=wasm64-unknown-unknown -### %s -c 2>&1 \
 // RUN:   | FileCheck %s -check-prefix=ECHO
 // RUN: %clang -target wasm64-unknown-unknown %s -emit-llvm -S -o - \
 // RUN:   | FileCheck %s
diff --git a/clang/test/Driver/x86_64-nacl-defines.cpp b/clang/test/Driver/x86_64-nacl-defines.cpp
index 87d02d7e10f7d..1b29fc7922419 100644
--- a/clang/test/Driver/x86_64-nacl-defines.cpp
+++ b/clang/test/Driver/x86_64-nacl-defines.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang -target x86_64-unknown-nacl -### %s -emit-llvm-only -c -o %t.o 2>&1 | FileCheck %s -check-prefix=ECHO
+// RUN: %clang --target=x86_64-unknown-nacl -### %s -c -o %t.o 2>&1 | FileCheck %s -check-prefix=ECHO
 // RUN: %clang -target x86_64-unknown-nacl %s -emit-llvm -S -c -o - | FileCheck %s
 // RUN: %clang -target x86_64-unknown-nacl %s -emit-llvm -S -c -pthread -o - | FileCheck %s -check-prefix=THREADS