diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/DefaultEditorTemplates.cs b/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/DefaultEditorTemplates.cs
index 49d2bee693..7a62774805 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/DefaultEditorTemplates.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/DefaultEditorTemplates.cs
@@ -264,10 +264,15 @@ namespace Microsoft.AspNet.Mvc.Rendering
 
                 builder.Append(templateBuilder.Build());
 
-                // TODO: Add IHtmlHelper.ValidationMessage() and call just prior to closing the <div/> tag
                 if (!propertyMetadata.HideSurroundingHtml)
                 {
                     builder.Append(" ");
+                    builder.Append(html.ValidationMessage(
+                        propertyMetadata.PropertyName,
+                        message: null,
+                        htmlAttributes: null,
+                        tag: null));
+
                     builder.AppendLine(divTag.ToString(TagRenderMode.EndTag));
                 }
             }
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultEditorTemplatesTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultEditorTemplatesTests.cs
index 15ecc0060b..7996a4af89 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultEditorTemplatesTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultEditorTemplatesTests.cs
@@ -19,10 +19,14 @@ namespace Microsoft.AspNet.Mvc.Core
             var expected =
                 "<div class=\"editor-label\"><label for=\"Property1\">Property1</label></div>" + Environment.NewLine
               + "<div class=\"editor-field\">Model = p1, ModelType = System.String, PropertyName = Property1," +
-                    " SimpleDisplayText = p1 </div>" + Environment.NewLine
+                    " SimpleDisplayText = p1 " +
+                    "<span class=\"field-validation-valid\" data-valmsg-for=\"Property1\" data-valmsg-replace=\"true\">" +
+                    "</span></div>" + Environment.NewLine
               + "<div class=\"editor-label\"><label for=\"Property2\">Property2</label></div>" + Environment.NewLine
               + "<div class=\"editor-field\">Model = (null), ModelType = System.String, PropertyName = Property2," +
-                    " SimpleDisplayText = (null) </div>" + Environment.NewLine;
+                    " SimpleDisplayText = (null) " +
+                    "<span class=\"field-validation-valid\" data-valmsg-for=\"Property2\" data-valmsg-replace=\"true\">" +
+                    "</span></div>" + Environment.NewLine;
 
             // Arrange
             var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = "p1", Property2 = null };
@@ -85,11 +89,13 @@ namespace Microsoft.AspNet.Mvc.Core
             var expected =
 @"<div class=""editor-label""><label for=""Property1"">Property1</label></div>" +
 Environment.NewLine +
-@"<div class=""editor-field""><input class=""text-box single-line"" id=""Property1"" name=""Property1"" type=""text"" value="""" /> </div>" +
+@"<div class=""editor-field""><input class=""text-box single-line"" id=""Property1"" name=""Property1"" type=""text"" value="""" /> " +
+@"<span class=""field-validation-valid"" data-valmsg-for=""Property1"" data-valmsg-replace=""true""></span></div>" +
 Environment.NewLine +
 @"<div class=""editor-label""><label for=""Property3"">Property3</label></div>" +
 Environment.NewLine +
-@"<div class=""editor-field""><input class=""text-box single-line"" id=""Property3"" name=""Property3"" type=""text"" value="""" /> </div>" +
+@"<div class=""editor-field""><input class=""text-box single-line"" id=""Property3"" name=""Property3"" type=""text"" value="""" /> " +
+@"<span class=""field-validation-valid"" data-valmsg-for=""Property3"" data-valmsg-replace=""true""></span></div>" +
 Environment.NewLine;
 
             var model = new DefaultTemplatesUtilities.ObjectWithScaffoldColumn();