diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
index ce6d26131cb1..719355eaecaa 100644
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -4791,19 +4791,19 @@ void Clang::AddClangCLArgs(const ArgList &Args, types::ID InputType,
     llvm::Triple::ArchType Arch = getToolChain().getArch();
     switch (DCCOptId) {
     case options::OPT__SLASH_Gd:
-      DCCFlag = "-fdefault-calling-convention=cdecl";
+      DCCFlag = "-fdefault-calling-conv=cdecl";
       break;
     case options::OPT__SLASH_Gr:
       ArchSupported = Arch == llvm::Triple::x86;
-      DCCFlag = "-fdefault-calling-convention=fastcall";
+      DCCFlag = "-fdefault-calling-conv=fastcall";
       break;
     case options::OPT__SLASH_Gz:
       ArchSupported = Arch == llvm::Triple::x86;
-      DCCFlag = "-fdefault-calling-convention=stdcall";
+      DCCFlag = "-fdefault-calling-conv=stdcall";
       break;
     case options::OPT__SLASH_Gv:
       ArchSupported = Arch == llvm::Triple::x86 || Arch == llvm::Triple::x86_64;
-      DCCFlag = "-fdefault-calling-convention=vectorcall";
+      DCCFlag = "-fdefault-calling-conv=vectorcall";
       break;
     }
 
diff --git a/clang/test/Driver/cl-cc-flags.c b/clang/test/Driver/cl-cc-flags.c
index 64ff1cb5e8ce..76f116e199e2 100644
--- a/clang/test/Driver/cl-cc-flags.c
+++ b/clang/test/Driver/cl-cc-flags.c
@@ -2,32 +2,32 @@
 // command-line option, e.g. on Mac where %s is commonly under /Users.
 
 // RUN: %clang_cl --target=i686-windows-msvc /Gd -### -- %s 2>&1 | FileCheck --check-prefix=CDECL %s
-// CDECL: -fdefault-calling-convention=cdecl
+// CDECL: -fdefault-calling-conv=cdecl
 
 // RUN: %clang_cl --target=i686-windows-msvc /Gr -### -- %s 2>&1 | FileCheck --check-prefix=FASTCALL %s
-// FASTCALL: -fdefault-calling-convention=fastcall
+// FASTCALL: -fdefault-calling-conv=fastcall
 
 // RUN: %clang_cl --target=i686-windows-msvc /Gz -### -- %s 2>&1 | FileCheck --check-prefix=STDCALL %s
-// STDCALL: -fdefault-calling-convention=stdcall
+// STDCALL: -fdefault-calling-conv=stdcall
 
 // RUN: %clang_cl --target=i686-windows-msvc /Gv -### -- %s 2>&1 | FileCheck --check-prefix=VECTORCALL %s
-// VECTORCALL: -fdefault-calling-convention=vectorcall
+// VECTORCALL: -fdefault-calling-conv=vectorcall
 
 // Last one should win:
 
 // RUN: %clang_cl --target=i686-windows-msvc /Gd /Gv -### -- %s 2>&1 | FileCheck --check-prefix=LASTWINS_VECTOR %s
-// LASTWINS_VECTOR: -fdefault-calling-convention=vectorcall
+// LASTWINS_VECTOR: -fdefault-calling-conv=vectorcall
 
 // RUN: %clang_cl --target=i686-windows-msvc /Gv /Gd -### -- %s 2>&1 | FileCheck --check-prefix=LASTWINS_CDECL %s
-// LASTWINS_CDECL: -fdefault-calling-convention=cdecl
+// LASTWINS_CDECL: -fdefault-calling-conv=cdecl
 
 // No fastcall or stdcall on x86_64:
 
-// RUN: %clang_cl --target=x86_64-windows-msvc /Gr -### -- %s 2>&1 | FileCheck --check-prefix=UNSUPPORTED %s
-// RUN: %clang_cl --target=x86_64-windows-msvc /Gz -### -- %s 2>&1 | FileCheck --check-prefix=UNSUPPORTED %s
-// RUN: %clang_cl --target=thumbv7-windows-msvc /Gv -### -- %s 2>&1 | FileCheck --check-prefix=UNSUPPORTED %s
+// RUN: %clang_cl -Wno-msvc-not-found --target=x86_64-windows-msvc /Gr -### -- %s 2>&1 | FileCheck --check-prefix=UNSUPPORTED %s
+// RUN: %clang_cl -Wno-msvc-not-found --target=x86_64-windows-msvc /Gz -### -- %s 2>&1 | FileCheck --check-prefix=UNSUPPORTED %s
+// RUN: %clang_cl -Wno-msvc-not-found --target=thumbv7-windows-msvc /Gv -### -- %s 2>&1 | FileCheck --check-prefix=UNSUPPORTED %s
 
 // UNSUPPORTED-NOT: error:
 // UNSUPPORTED-NOT: warning:
-// UNSUPPORTED-NOT: -fdefault-calling-convention=
+// UNSUPPORTED-NOT: -fdefault-calling-conv=