diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index 1ce2c3d2c6d49..c5dd4d1d39f30 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -2301,16 +2301,7 @@ ParserStatus Parser::parseFreestandingMacroExpansion(
 
   bool hasWhitespaceBeforeName = poundEndLoc != Tok.getLoc();
 
-  // Diagnose and parse keyword right after `#`.
-  if (Tok.isKeyword() && !hasWhitespaceBeforeName) {
-    diagnose(Tok, diag::keyword_cant_be_identifier, Tok.getText());
-    diagnose(Tok, diag::backticks_to_escape)
-        .fixItReplace(Tok.getLoc(), "`" + Tok.getText().str() + "`");
-
-    // Let 'parseDeclNameRef' to parse this as an identifier.
-    Tok.setKind(tok::identifier);
-  }
-  macroNameRef = parseDeclNameRef(macroNameLoc, diag, DeclNameOptions());
+  macroNameRef = parseDeclNameRef(macroNameLoc, diag, DeclNameFlag::AllowKeywords);
   if (!macroNameRef)
     return makeParserError();
 
diff --git a/test/Macros/macro_keywordname.swift b/test/Macros/macro_keywordname.swift
index 3a302538b312e..2e8b94b8d33a8 100644
--- a/test/Macros/macro_keywordname.swift
+++ b/test/Macros/macro_keywordname.swift
@@ -53,7 +53,7 @@ import MacroLib
 @freestanding(expression) public macro `class`() -> Int = #externalMacro(module: "MacroDefinition", type: "OneMacro")
 
 func test() {
-  let _: Int = #public() // expected-error {{keyword 'public' cannot be used as an identifier here}} expected-note {{if this name is unavoidable, use backticks to escape it}}
+  let _: Int = #public()
   let _: Int = #`public`()
   let _: Int = #escaped()
   let _: Int = #`class`()
diff --git a/test/Macros/macro_self.swift b/test/Macros/macro_self.swift
index 4e8b39b0fc173..47b278568314c 100644
--- a/test/Macros/macro_self.swift
+++ b/test/Macros/macro_self.swift
@@ -9,11 +9,11 @@ func sync() {}
 macro Self() = #externalMacro(module: "MacroDefinition", type: "InvalidMacro")
 
 func testSelfAsFreestandingMacro() {
-  _ = #self // expected-error {{keyword 'self' cannot be used as an identifier here}} expected-note {{use backticks to escape it}}
+  _ = #self
 }
 
 func testCapitalSelfAsFreestandingMacro() {
-  _ = #Self // expected-error {{keyword 'Self' cannot be used as an identifier here}} expected-note {{use backticks to escape it}}
+  _ = #Self
 }
  
 func testSelfAsAttachedMacro() {
diff --git a/test/Parse/macro_decl.swift b/test/Parse/macro_decl.swift
index 3fc66878c1f8d..53f4afd5e5b66 100644
--- a/test/Parse/macro_decl.swift
+++ b/test/Parse/macro_decl.swift
@@ -51,6 +51,6 @@ public # someFunc // expected-error {{extraneous whitespace between '#' and macr
 
 struct S {
   # someFunc // expected-error {{extraneous whitespace between '#' and macro name is not permitted}} {{4-5=}}
-  #class // expected-error {{keyword 'class' cannot be used as an identifier here}} expected-note {{if this name is unavoidable, use backticks to escape it}} {{4-9=`class`}} 
+  #class
   # struct Inner {} // expected-error {{expected a macro identifier for a pound literal declaration}} expected-error {{consecutive declarations on a line}}
 }
diff --git a/test/Parse/macro_expr.swift b/test/Parse/macro_expr.swift
index 3e9a6d061931a..16928aaa5d478 100644
--- a/test/Parse/macro_expr.swift
+++ b/test/Parse/macro_expr.swift
@@ -44,7 +44,7 @@ do {
   _ = # macro() // expected-error {{extraneous whitespace between '#' and macro name is not permitted}} {{8-9=}}
 }
 do {
-  _ = #public() // expected-error {{keyword 'public' cannot be used as an identifier here}} expected-note {{if this name is unavoidable, use backticks to escape it}} {{8-14=`public`}}
+  _ = #public()
 }
 do {
   _ = # public() // expected-error {{expected a macro identifier for a pound literal expression}}
diff --git a/test/decl/import/import.swift b/test/decl/import/import.swift
index 6f7c10f537fcf..dc39bc85b6c80 100644
--- a/test/decl/import/import.swift
+++ b/test/decl/import/import.swift
@@ -35,9 +35,9 @@ import func Swift.print
 
 // rdar://14418336
 #import something_nonexistent
-// expected-error@-1 {{keyword 'import' cannot be used as an identifier here}} expected-note@-1 {{use backticks to escape it}}
-// expected-error@-2 {{no macro named 'import'}}
-// expected-error@-3 {{consecutive statements on a line}} expected-error@-3 {{cannot find 'something_nonexistent' in scope}}
+// expected-error@-1 {{no macro named 'import'}}
+// expected-error@-2 {{consecutive statements on a line}} 
+// expected-error@-3 {{cannot find 'something_nonexistent' in scope}}
 
 // Import specific decls
 import typealias Swift.Int