diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.def b/clang/include/clang/Basic/DiagnosticSemaKinds.def
index 27708236d183..eda47d6dbb76 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.def
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.def
@@ -775,7 +775,7 @@ DIAG(err_field_declared_as_function, ERROR,
 DIAG(err_field_incomplete, ERROR,
      "field has incomplete type %0")
 DIAG(ext_variable_sized_type_in_struct, EXTWARN,
-     "variable sized type %0 not at the end of a struct or class is a "
+     "field of variable sized type %0 not at the end of a struct or class is a "
      "GNU extension")
 DIAG(err_flexible_array_empty_struct, ERROR,
      "flexible array %0 not allowed in otherwise empty struct")
diff --git a/clang/test/Sema/struct-decl.c b/clang/test/Sema/struct-decl.c
index e71a0b2b0c4f..3f95b7a71b84 100644
--- a/clang/test/Sema/struct-decl.c
+++ b/clang/test/Sema/struct-decl.c
@@ -29,7 +29,7 @@ struct pppoe_tag {
  char tag_data[];
 };
 struct datatag {
- struct pppoe_tag hdr; //expected-warning{{variable sized type 'hdr' not at the end of a struct or class is a GNU extension}}
+ struct pppoe_tag hdr; //expected-warning{{field of variable sized type 'hdr' not at the end of a struct or class is a GNU extension}}
  char data;
 };