diff --git a/include/clang/Basic/DiagnosticDriverKinds.td b/include/clang/Basic/DiagnosticDriverKinds.td
index 6e744db2cb012c2a2d48dc15d6403adf07dc98be..ea597a8388661e5ac7b7d1b4a46c2f1bcbf13a8d 100644
--- a/include/clang/Basic/DiagnosticDriverKinds.td
+++ b/include/clang/Basic/DiagnosticDriverKinds.td
@@ -286,5 +286,5 @@ def err_drv_defsym_invalid_symval : Error<"Value is not an integer: %0">;
 def warn_drv_msvc_not_found : Warning<
   "unable to find a Visual Studio installation; "
   "try running Clang from a developer command prompt">,
-  InGroup<InvalidOrNonExistentDirectory>;
+  InGroup<DiagGroup<"msvc-not-found">>;
 }
diff --git a/test/Misc/backend-stack-frame-diagnostics.cpp b/test/Misc/backend-stack-frame-diagnostics.cpp
index a850f2253959ddb47568550e64b9a0a2a903180f..bb5566f1a43124e38986591e3f3590d80b7dc202 100644
--- a/test/Misc/backend-stack-frame-diagnostics.cpp
+++ b/test/Misc/backend-stack-frame-diagnostics.cpp
@@ -8,7 +8,7 @@
 
 // Test that link invocations don't emit an "argument unused during compilation" diagnostic.
 // RUN: touch %t.o
-// RUN: %clang -Werror -Wno-liblto -Wframe-larger-than=0 %t.o -###  2>&1 | not grep ' error: '
+// RUN: %clang -Werror -Wno-msvc-not-found -Wno-liblto -Wframe-larger-than=0 %t.o -###  2>&1 | not grep ' error: '
 
 // TODO: Support rich backend diagnostics for Objective-C methods.