diff --git a/clang/test/Modules/diagnose-missing-import.m b/clang/test/Modules/diagnose-missing-import.m
--- a/clang/test/Modules/diagnose-missing-import.m
+++ b/clang/test/Modules/diagnose-missing-import.m
@@ -2,9 +2,6 @@
 // RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -I%S/Inputs/diagnose-missing-import \
 // RUN:   -Werror=implicit-function-declaration -fsyntax-only \
 // RUN:   -fimplicit-module-maps -verify %s
-// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -I%S/Inputs/diagnose-missing-import \
-// RUN:   -Werror-implicit-function-declaration -fsyntax-only \
-// RUN:   -fimplicit-module-maps -verify %s
 @import NCI;
 
 void foo() {
diff --git a/clang/test/Sema/implicit-decl.c b/clang/test/Sema/implicit-decl.c
--- a/clang/test/Sema/implicit-decl.c
+++ b/clang/test/Sema/implicit-decl.c
@@ -1,4 +1,7 @@
-// RUN: %clang_cc1 %s -verify -fsyntax-only -Werror
+// RUN: %clang_cc1 %s -verify -fsyntax-only -Werror=implicit-function-declaration
+
+/// -Werror-implicit-function-declaration is a deprecated alias used by many projects.
+// RUN: %clang_cc1 %s -verify -fsyntax-only -Werror-implicit-function-declaration
 
 typedef int int32_t;
 typedef unsigned char Boolean;
diff --git a/clang/test/Sema/vecshift.c b/clang/test/Sema/vecshift.c
--- a/clang/test/Sema/vecshift.c
+++ b/clang/test/Sema/vecshift.c
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -fsyntax-only -DERR -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s -Wno-error=vec-elem-size
 // RUN: %clang_cc1 -fsyntax-only -DEXT -DERR -verify %s
+// RUN: %clang_cc1 -fsyntax-only -DEXT -verify %s -Wno-error=vec-elem-size
 
 #ifdef EXT
 typedef __attribute__((__ext_vector_type__(8))) char vector_char8;