diff --git a/clang/test/Driver/aarch64-thread-pointer.c b/clang/test/Driver/aarch64-thread-pointer.c
index 6a5d4ba0852ed..b1c6df4ac5e5d 100644
--- a/clang/test/Driver/aarch64-thread-pointer.c
+++ b/clang/test/Driver/aarch64-thread-pointer.c
@@ -1,45 +1,45 @@
 // Test of the AArch64 values of -mtp=, checking that each one maps to
 // the right target features.
 
-// RUN: %clang --target=aarch64-linux -### -S %s -arch armv8a 2>&1 | \
+// RUN: %clang --target=aarch64-linux -### -S %s 2>&1 | \
 // RUN: FileCheck -check-prefix=ARMv8_THREAD_POINTER_EL0 %s
-// RUN: %clang --target=aarch64-linux -### -S %s -arch armv8a -mtp=el0 2>&1 | \
+// RUN: %clang --target=aarch64-linux -### -S %s -mtp=el0 2>&1 | \
 // RUN: FileCheck -check-prefix=ARMv8_THREAD_POINTER_EL0 %s
-// RUN: %clang --target=aarch64-linux -### -S %s -arch armv8a -mtp=tpidr_el0 2>&1 | \
+// RUN: %clang --target=aarch64-linux -### -S %s -mtp=tpidr_el0 2>&1 | \
 // RUN: FileCheck -check-prefix=ARMv8_THREAD_POINTER_EL0 %s
 // ARMv8_THREAD_POINTER_EL0-NOT: "-target-feature" "+tpidrro-el0"
 // ARMv8_THREAD_POINTER_EL0-NOT: "-target-feature" "+tpidr-el1"
 // ARMv8_THREAD_POINTER_EL0-NOT: "-target-feature" "+tpidr-el2"
 // ARMv8_THREAD_POINTER_EL0-NOT: "-target-feature" "+tpidr-el3"
 
-// RUN: %clang --target=aarch64-linux -### -S %s -arch armv8a -mtp=tpidrro_el0 2>&1 | \
+// RUN: %clang --target=aarch64-linux -### -S %s -mtp=tpidrro_el0 2>&1 | \
 // RUN: FileCheck -check-prefix=ARMv8_THREAD_POINTER_ROEL0 %s
 // ARMv8_THREAD_POINTER_ROEL0:     "-target-feature" "+tpidrro-el0"
 // ARMv8_THREAD_POINTER_ROEL0-NOT: "-target-feature" "+tpidr-el1"
 // ARMv8_THREAD_POINTER_ROEL0-NOT: "-target-feature" "+tpidr-el2"
 // ARMv8_THREAD_POINTER_ROEL0-NOT: "-target-feature" "+tpidr-el3"
 
-// RUN: %clang --target=aarch64-linux -### -S %s -arch armv8a -mtp=el1 2>&1 | \
+// RUN: %clang --target=aarch64-linux -### -S %s -mtp=el1 2>&1 | \
 // RUN: FileCheck -check-prefix=ARMv8_THREAD_POINTER_EL1 %s
-// RUN: %clang --target=aarch64-linux -### -S %s -arch armv8a -mtp=tpidr_el1 2>&1 | \
+// RUN: %clang --target=aarch64-linux -### -S %s -mtp=tpidr_el1 2>&1 | \
 // RUN: FileCheck -check-prefix=ARMv8_THREAD_POINTER_EL1 %s
 // ARMv8_THREAD_POINTER_EL1-NOT: "-target-feature" "+tpidrro-el0"
 // ARMv8_THREAD_POINTER_EL1:     "-target-feature" "+tpidr-el1"
 // ARMv8_THREAD_POINTER_EL1-NOT: "-target-feature" "+tpidr-el2"
 // ARMv8_THREAD_POINTER_EL1-NOT: "-target-feature" "+tpidr-el3"
 
-// RUN: %clang --target=aarch64-linux -### -S %s -arch armv8a -mtp=el2 2>&1 | \
+// RUN: %clang --target=aarch64-linux -### -S %s -mtp=el2 2>&1 | \
 // RUN: FileCheck -check-prefix=ARMv8_THREAD_POINTER_EL2 %s
-// RUN: %clang --target=aarch64-linux -### -S %s -arch armv8a -mtp=tpidr_el2 2>&1 | \
+// RUN: %clang --target=aarch64-linux -### -S %s -mtp=tpidr_el2 2>&1 | \
 // RUN: FileCheck -check-prefix=ARMv8_THREAD_POINTER_EL2 %s
 // ARMv8_THREAD_POINTER_EL2-NOT: "-target-feature" "+tpidrro-el0"
 // ARMv8_THREAD_POINTER_EL2-NOT: "-target-feature" "+tpidr-el1"
 // ARMv8_THREAD_POINTER_EL2:     "-target-feature" "+tpidr-el2"
 // ARMv8_THREAD_POINTER_EL2-NOT: "-target-feature" "+tpidr-el3"
 
-// RUN: %clang --target=aarch64-linux -### -S %s -arch armv8a -mtp=el3 2>&1 | \
+// RUN: %clang --target=aarch64-linux -### -S %s -mtp=el3 2>&1 | \
 // RUN: FileCheck -check-prefix=ARMv8_THREAD_POINTER_EL3 %s
-// RUN: %clang --target=aarch64-linux -### -S %s -arch armv8a -mtp=tpidr_el3 2>&1 | \
+// RUN: %clang --target=aarch64-linux -### -S %s -mtp=tpidr_el3 2>&1 | \
 // RUN: FileCheck -check-prefix=ARMv8_THREAD_POINTER_EL3 %s
 // ARMv8_THREAD_POINTER_EL3-NOT: "-target-feature" "+tpidrro-el0"
 // ARMv8_THREAD_POINTER_EL3-NOT: "-target-feature" "+tpidr-el1"
diff --git a/clang/test/Headers/arm-neon-header.c b/clang/test/Headers/arm-neon-header.c
index 7e98d03dfc191..89bd5aaa25420 100644
--- a/clang/test/Headers/arm-neon-header.c
+++ b/clang/test/Headers/arm-neon-header.c
@@ -22,7 +22,7 @@
 
 // RUN: %clang -fsyntax-only -Wall -Werror -ffreestanding --target=aarch64-none-elf -march=armv8.2-a+fp16fml+crypto+dotprod -std=c11 -xc --sysroot=%S/Inputs -flax-vector-conversions=none %s
 // RUN: %clang -fsyntax-only -Wall -Werror -ffreestanding --target=aarch64_be-none-elf -march=armv8.2-a+fp16fml+crypto+dotprod -std=c11 -xc --sysroot=%S/Inputs -flax-vector-conversions=none %s
-// RUN: %clang -fsyntax-only -Wall -Werror -ffreestanding --target=arm64-linux-gnu -arch +neon -std=c11 -xc --sysroot=%S/Inputs -flax-vector-conversions=none %s
+// RUN: %clang -fsyntax-only -Wall -Werror -ffreestanding --target=arm64-linux-gnu -std=c11 -xc --sysroot=%S/Inputs -flax-vector-conversions=none %s
 
 // REQUIRES: aarch64-registered-target || arm-registered-target