diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultDisplayTemplatesTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultDisplayTemplatesTests.cs
index c3141bce6f..564ceef5b9 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultDisplayTemplatesTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultDisplayTemplatesTests.cs
@@ -153,11 +153,13 @@ namespace Microsoft.AspNet.Mvc.Core.Test
             Assert.Equal("Model string", result.ToString());
         }
 
-        [Fact]
-        public void DisplayFor_FindsModel_EvenIfNull()
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void DisplayFor_FindsModel_EvenIfNullOrEmpty(string propertyValue)
         {
             // Arrange
-            var model = new DefaultTemplatesUtilities.ObjectTemplateModel();
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = propertyValue, };
             var viewEngine = new Mock<IViewEngine>();
             viewEngine
                 .Setup(v => v.FindPartialView(It.IsAny<IDictionary<string, object>>(), It.IsAny<string>()))
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultEditorTemplatesTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultEditorTemplatesTests.cs
index fede61b4ed..c019917710 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultEditorTemplatesTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultEditorTemplatesTests.cs
@@ -167,11 +167,13 @@ Environment.NewLine;
                 result.ToString());
         }
 
-        [Fact]
-        public void EditorFor_FindsModel_EvenIfNull()
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void EditorFor_FindsModel_EvenIfNullOrEmpty(string propertyValue)
         {
             // Arrange
-            var model = new DefaultTemplatesUtilities.ObjectTemplateModel();
+            var model = new DefaultTemplatesUtilities.ObjectTemplateModel { Property1 = propertyValue, };
             var viewEngine = new Mock<IViewEngine>();
             viewEngine
                 .Setup(v => v.FindPartialView(It.IsAny<IDictionary<string, object>>(), It.IsAny<string>()))