diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ViewDataDictionaryTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ViewDataDictionaryTest.cs
index 8ba6e0e9f5..07b01e3904 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ViewDataDictionaryTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ViewDataDictionaryTest.cs
@@ -137,8 +137,11 @@ namespace Microsoft.AspNet.Mvc.Core
             // Arrange
             var vdd = new ViewDataDictionary(new EmptyModelMetadataProvider());
             
-            // Act & Assert
-            Assert.DoesNotThrow(() => { vdd.Model = model; });
+            // Act
+            vdd.Model = model;
+
+            // Assert
+            Assert.Same(model, vdd.Model);
         }
 
         [Fact]
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/project.json b/test/Microsoft.AspNet.Mvc.Core.Test/project.json
index 5af82a46ad..4df41d5459 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/project.json
@@ -6,10 +6,10 @@
     "Microsoft.AspNet.Mvc" : "6.0.0-*",
     "Microsoft.AspNet.Testing": "1.0.0-*",
     "Moq": "4.2.1312.1622",
-    "Xunit.KRunner": "1.0.0-*"
+    "xunit.runner.kre": "1.0.0-*"
   },
   "commands": {
-    "test": "Xunit.KRunner"
+    "test": "xunit.runner.kre"
   },
   "frameworks": {
     "aspnet50": { }
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
index b5bc4b1b20..5f50ff8f3b 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
@@ -34,10 +34,10 @@
         "Microsoft.AspNet.TestHost": "1.0.0-*",
         "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0",
         "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*",
-        "Xunit.KRunner": "1.0.0-*"
+        "xunit.runner.kre": "1.0.0-*"
     },
     "commands": {
-        "test": "Xunit.KRunner"
+        "test": "xunit.runner.kre"
     },
     "frameworks": {
         "aspnet50": {
diff --git a/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/project.json b/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/project.json
index 67778ba25e..f8d8b77fac 100644
--- a/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/project.json
@@ -2,10 +2,10 @@
     "dependencies": {
         "Microsoft.AspNet.Mvc.HeaderValueAbstractions": "1.0.0-*",
         "Microsoft.AspNet.Testing": "1.0.0-*",
-        "Xunit.KRunner": "1.0.0-*"
+        "xunit.runner.kre": "1.0.0-*"
     },
     "commands": {
-        "test": "Xunit.KRunner"
+        "test": "xunit.runner.kre"
     },
     "frameworks": {
         "aspnet50": { },
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
index 2abf9ab867..238ef8b091 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
@@ -7,10 +7,10 @@
         "Microsoft.AspNet.PipelineCore": "1.0.0-*",
         "Microsoft.AspNet.Testing": "1.0.0-*",
         "Moq": "4.2.1312.1622",
-        "Xunit.KRunner": "1.0.0-*"
+        "xunit.runner.kre": "1.0.0-*"
     },
     "commands": {
-        "test": "Xunit.KRunner"
+        "test": "xunit.runner.kre"
     },
     "frameworks": {
         "aspnet50": { },
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json
index d1f0acf5f6..ee6ce65e51 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json
@@ -3,10 +3,10 @@
     "dependencies": {
         "Microsoft.AspNet.Mvc.Razor.Host": "6.0.0-*",
         "Microsoft.AspNet.Testing": "1.0.0-*",
-        "Xunit.KRunner": "1.0.0-*"
+        "xunit.runner.kre": "1.0.0-*"
     },
     "commands": {
-        "test": "Xunit.KRunner"
+        "test": "xunit.runner.kre"
     },
     "frameworks": {
         "aspnet50": {
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/project.json b/test/Microsoft.AspNet.Mvc.Razor.Test/project.json
index 9db98807c4..3166e67205 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/project.json
@@ -7,10 +7,10 @@
     "dependencies": {
         "Microsoft.AspNet.Mvc.Razor": "6.0.0-*",
         "Microsoft.AspNet.Testing": "1.0.0-*",
-        "Xunit.KRunner": "1.0.0-*"
+        "xunit.runner.kre": "1.0.0-*"
     },
     "commands": {
-        "test": "Xunit.KRunner"
+        "test": "xunit.runner.kre"
     },
     "frameworks": {
         "aspnet50": {
diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/project.json b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/project.json
index 549e7651fe..a05800beec 100644
--- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/project.json
@@ -1,11 +1,11 @@
 {
-    "commands": {
-        "test": "Xunit.KRunner"
-    },
     "dependencies": {
         "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-*",
         "Microsoft.AspNet.Testing": "1.0.0-*",
-        "Xunit.KRunner": "1.0.0-*"
+        "xunit.runner.kre": "1.0.0-*"
+    },
+    "commands": {
+        "test": "xunit.runner.kre"
     },
     "frameworks": {
         "aspnet50": {
diff --git a/test/Microsoft.AspNet.Mvc.Test/project.json b/test/Microsoft.AspNet.Mvc.Test/project.json
index 55c791c321..0f116b9359 100644
--- a/test/Microsoft.AspNet.Mvc.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.Test/project.json
@@ -4,10 +4,10 @@
   },
   "dependencies": {
     "Microsoft.AspNet.Mvc" : "6.0.0-*",
-    "Xunit.KRunner": "1.0.0-*"
+    "xunit.runner.kre": "1.0.0-*"
   },
   "commands": {
-    "test": "Xunit.KRunner"
+    "test": "xunit.runner.kre"
   },
   "frameworks": {
     "aspnet50": {
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/project.json b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/project.json
index 27d11bb19c..9aaf8cc023 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/project.json
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/project.json
@@ -6,10 +6,10 @@
         "Microsoft.AspNet.Mvc.WebApiCompatShim": "6.0.0-*",
         "Microsoft.AspNet.Testing": "1.0.0-*",
         "Moq": "4.2.1312.1622",
-        "Xunit.KRunner": "1.0.0-*"
+        "xunit.runner.kre": "1.0.0-*"
     },
     "commands": {
-        "test": "Xunit.KRunner"
+        "test": "xunit.runner.kre"
     },
     "frameworks": {
         "aspnet50": {},