diff --git a/lib/rules/named-grid-areas-no-invalid/__tests__/index.js b/lib/rules/named-grid-areas-no-invalid/__tests__/index.js
index f713b296df..4855c7fddb 100644
--- a/lib/rules/named-grid-areas-no-invalid/__tests__/index.js
+++ b/lib/rules/named-grid-areas-no-invalid/__tests__/index.js
@@ -17,7 +17,7 @@ testRule({
 		},
 		{
 			code: stripIndent`
-				a { 
+				a {
 					grid-template-areas: "head head"
 						"nav  main"
 						"nav  foot";
@@ -25,8 +25,8 @@ testRule({
 		},
 		{
 			code: stripIndent`
-				a { 
-					grid-template-areas: 
+				a {
+					grid-template-areas:
 						/* "" */ "head head"
 						"nav  main" /* "a b c" */
 						"nav  foot" /* "" */;
@@ -52,8 +52,17 @@ testRule({
 		},
 		{
 			code: stripIndent`
-				a { 
-					grid-template-areas: /* "comment" */ none /* "comment " */; 
+				a {
+					grid-template-areas: /* "comment" */ none /* "comment " */;
+				}`,
+		},
+		{
+			code: stripIndent`
+				a {
+					grid-template:
+						"a a a" 40px
+						"b c c" 40px
+						"b c c" 40px / 1fr 1fr 1fr;
 				}`,
 		},
 	],
@@ -80,10 +89,10 @@ testRule({
 		},
 		{
 			code: stripIndent`
-			  a { 
+			  a {
 					grid-template-areas: "header header header header"
 						"main main . sidebar"
-						"footer footer footer header"; 
+						"footer footer footer header";
 				}`,
 			message: messages.expectedRectangle('header'),
 			line: 2,
@@ -103,12 +112,12 @@ testRule({
 		},
 		{
 			code: stripIndent`
-				a { grid-template-areas: 
-			   	""; 
+				a { grid-template-areas:
+					"";
 				}`,
 			message: messages.expectedToken(),
 			line: 2,
-			column: 4,
+			column: 2,
 		},
 		{
 			code: 'a { grid-template-areas: "" "" ""; }',
@@ -120,9 +129,9 @@ testRule({
 		},
 		{
 			code: stripIndent`
-				a { 
+				a {
 					grid-template-areas: /* none */
- 						"" /* none */; 
+ 						"" /* none */;
 				}`,
 			message: messages.expectedToken(),
 			line: 3,
@@ -134,5 +143,23 @@ testRule({
 			line: 1,
 			column: 26,
 		},
+		{
+			code: stripIndent`
+				a {
+					grid-template:
+						"a a" 40px
+						"b c c" 40px
+						"b c c" 40px / 1fr 1fr 1fr;
+				}`,
+			message: messages.expectedSameNumber(),
+			line: 3,
+			column: 3,
+		},
+		{
+			code: `a { grid: "" 200px "b" min-content; }`,
+			message: messages.expectedToken(),
+			line: 1,
+			column: 11,
+		},
 	],
 });
diff --git a/lib/rules/named-grid-areas-no-invalid/index.js b/lib/rules/named-grid-areas-no-invalid/index.js
index 8d66bbd4a1..91e5c3e0ae 100644
--- a/lib/rules/named-grid-areas-no-invalid/index.js
+++ b/lib/rules/named-grid-areas-no-invalid/index.js
@@ -25,7 +25,7 @@ const rule = (primary) => {
 			return;
 		}
 
-		root.walkDecls(/^grid-template-areas$/i, (decl) => {
+		root.walkDecls(/^(?:grid|grid-template|grid-template-areas)$/i, (decl) => {
 			const { value } = decl;
 
 			if (value.toLowerCase().trim() === 'none') return;