diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index f622ab4c7e93..a68111b4a95b 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -481,16 +481,6 @@ void runClangTidy(clang::tidy::ClangTidyContext &Context,
   ClangTool Tool(Compilations, InputFiles,
                  std::make_shared<PCHContainerOperations>(), BaseFS);
 
-  // Add __clang_analyzer__ macro definition for compatibility with the clang
-  // static analyzer.
-  ArgumentsAdjuster ClangTidyMacroDefinitionInserter =
-      [&Context](const CommandLineArguments &Args, StringRef Filename) {
-        ClangTidyOptions Opts = Context.getOptionsForFile(Filename);
-        CommandLineArguments AdjustedArgs = Args;
-        AdjustedArgs.emplace_back("-D__clang_analyzer__");
-        return AdjustedArgs;
-      };
-
   // Add extra arguments passed by the clang-tidy command-line.
   ArgumentsAdjuster PerFileExtraArgumentsInserter =
       [&Context](const CommandLineArguments &Args, StringRef Filename) {
@@ -525,7 +515,6 @@ void runClangTidy(clang::tidy::ClangTidyContext &Context,
         return AdjustedArgs;
       };
 
-  Tool.appendArgumentsAdjuster(ClangTidyMacroDefinitionInserter);
   Tool.appendArgumentsAdjuster(PerFileExtraArgumentsInserter);
   Tool.appendArgumentsAdjuster(PluginArgumentsRemover);
   if (Profile)
diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-__clang_analyzer__macro.cpp b/clang-tools-extra/test/clang-tidy/clang-tidy-__clang_analyzer__macro.cpp
deleted file mode 100755
index 8d2314467682..000000000000
--- a/clang-tools-extra/test/clang-tidy/clang-tidy-__clang_analyzer__macro.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %check_clang_tidy %s * %t
-
-#if defined(__clang_analyzer__)
-#warning __clang_analyzer__ is defined
-#endif
-// CHECK-MESSAGES: :[[@LINE-2]]:2: warning: __clang_analyzer__ is defined [clang-diagnostic-#warnings]
-
-