diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index d47a77a74401a..2cad5dbf65273 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -20034,7 +20034,7 @@ namespace ts {
         function checkJSDocAugmentsTag(node: JSDocAugmentsTag): void {
             const classLike = getJSDocHost(node);
             if (!isClassDeclaration(classLike) && !isClassExpression(classLike)) {
-                error(classLike, Diagnostics.JSDoc_augments_is_not_attached_to_a_class_declaration);
+                error(classLike, Diagnostics.JSDoc_0_is_not_attached_to_a_class, idText(node.tagName));
                 return;
             }
 
@@ -20049,7 +20049,7 @@ namespace ts {
             if (extend) {
                 const className = getIdentifierFromEntityNameExpression(extend.expression);
                 if (className && name.escapedText !== className.escapedText) {
-                    error(name, Diagnostics.JSDoc_augments_0_does_not_match_the_extends_1_clause, idText(name), idText(className));
+                    error(name, Diagnostics.JSDoc_0_1_does_not_match_the_extends_2_clause, idText(node.tagName), idText(name), idText(className));
                 }
             }
         }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 91ad9e52bfd60..e5e7b7748848a 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -3519,11 +3519,11 @@
         "category": "Error",
         "code": 8021
     },
-    "JSDoc '@augments' is not attached to a class declaration.": {
+    "JSDoc '@{0}' is not attached to a class.": {
         "category": "Error",
         "code": 8022
     },
-    "JSDoc '@augments {0}' does not match the 'extends {1}' clause.": {
+    "JSDoc '@{0} {1}' does not match the 'extends {2}' clause.": {
         "category": "Error",
         "code": 8023
     },
diff --git a/tests/baselines/reference/jsdocAugments_notAClass.errors.txt b/tests/baselines/reference/jsdocAugments_notAClass.errors.txt
index 9f8528f0cd804..daf20aaf884b1 100644
--- a/tests/baselines/reference/jsdocAugments_notAClass.errors.txt
+++ b/tests/baselines/reference/jsdocAugments_notAClass.errors.txt
@@ -1,4 +1,4 @@
-/b.js(3,10): error TS8022: JSDoc '@augments' is not attached to a class declaration.
+/b.js(3,10): error TS8022: JSDoc '@augments' is not attached to a class.
 
 
 ==== /b.js (1 errors) ====
@@ -6,5 +6,5 @@
     /** @augments A */
     function b() {}
              ~
-!!! error TS8022: JSDoc '@augments' is not attached to a class declaration.
+!!! error TS8022: JSDoc '@augments' is not attached to a class.
     
\ No newline at end of file