diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json
index 79f14b2740..cd96714728 100644
--- a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json
@@ -4,31 +4,24 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Mvc": "1.1.0-*",
-    "Microsoft.AspNetCore.Testing": "1.1.0-*"
+    "Microsoft.AspNetCore.Testing": "1.1.0-*",
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
+      "imports": "dotnet5.4",
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
     },
-    "net451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      }
-    }
+    "net451": {}
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json
index 159e130763..8632c3a83b 100644
--- a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json
@@ -3,7 +3,7 @@
     "warningsAsErrors": true
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Mvc": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.TestCommon": {
@@ -11,29 +11,22 @@
       "type": "build"
     },
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
-    "Microsoft.Extensions.Logging.Testing": "1.1.0-*"
+    "Microsoft.Extensions.Logging.Testing": "1.1.0-*",
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
+      "imports": "dotnet5.4",
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
     },
-    "net451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      }
-    }
+    "net451": {}
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json
index 935bc72d0c..ddee33a8d9 100644
--- a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json
@@ -5,7 +5,7 @@
     "preserveCompilationContext": true
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Http": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*",
@@ -21,29 +21,23 @@
     "Microsoft.Extensions.DependencyInjection": "1.1.0-*",
     "Microsoft.Extensions.DiagnosticAdapter": "1.1.0-*",
     "Microsoft.Extensions.Logging.Testing": "1.1.0-*",
-    "Microsoft.Extensions.Logging": "1.1.0-*"
+    "Microsoft.Extensions.Logging": "1.1.0-*",
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
+      "imports": "dotnet5.4",
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
-        "System.Diagnostics.TraceSource": "4.0.0-*"
+        "System.Diagnostics.TraceSource": "4.0.0-*",
+        "System.Xml.XmlDocument": "4.0.1-*"
       }
     },
-    "net451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      }
-    }
+    "net451": {}
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json
index 3004255918..4aa7b233d0 100644
--- a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json
@@ -3,7 +3,7 @@
     "warningsAsErrors": true
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Http": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*",
@@ -13,29 +13,22 @@
     },
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.1.0-*",
-    "Microsoft.Extensions.Logging.Testing": "1.1.0-*"
+    "Microsoft.Extensions.Logging.Testing": "1.1.0-*",
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
+      "imports": "dotnet5.4",
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
     },
-    "net451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      }
-    }
+    "net451": {}
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json
index d4806e655f..fd15ab6e42 100644
--- a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json
@@ -4,7 +4,7 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Mvc": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.TestCommon": {
@@ -13,29 +13,22 @@
     },
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.1.0-*",
-    "Microsoft.Extensions.Logging.Testing": "1.1.0-*"
+    "Microsoft.Extensions.Logging.Testing": "1.1.0-*",
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
+      "imports": "dotnet5.4",
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
     },
-    "net451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      }
-    }
+    "net451": {}
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json
index 3004255918..c997f650f1 100644
--- a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json
@@ -3,7 +3,7 @@
     "warningsAsErrors": true
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Http": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*",
@@ -13,29 +13,22 @@
     },
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.1.0-*",
-    "Microsoft.Extensions.Logging.Testing": "1.1.0-*"
+    "Microsoft.Extensions.Logging.Testing": "1.1.0-*",
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
+      "imports":"dotnet5.4",
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
     },
-    "net451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      }
-    }
+    "net451": {}
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json
index bb6e66575c..3a948291f2 100644
--- a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json
@@ -4,7 +4,7 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Http": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*",
@@ -12,29 +12,22 @@
       "type": "build",
       "version": "1.1.0-*"
     },
-    "Microsoft.AspNetCore.Testing": "1.1.0-*"
+    "Microsoft.AspNetCore.Testing": "1.1.0-*",
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
+      "imports": "dotnet5.4",
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
     },
-    "net451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      }
-    }
+    "net451": {}
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json
index a53fb2e1d5..d67bb07b10 100644
--- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json
@@ -10,7 +10,7 @@
     "warningsAsErrors": true
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "ApiExplorerWebSite": "1.0.0",
     "ApplicationModelWebSite": "1.0.0",
     "BasicWebSite": "1.0.0",
@@ -40,7 +40,8 @@
     "TagHelpersWebSite": "1.0.0",
     "VersioningWebSite": "1.0.0",
     "WebApiCompatShimWebSite": "1.0.0",
-    "XmlFormattersWebSite": "1.0.0"
+    "XmlFormattersWebSite": "1.0.0",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
@@ -51,10 +52,7 @@
           "type": "platform"
         }
       },
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ]
+      "imports": "portable-net451+win8"
     },
     "net451": {}
   }
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json
index bbe5f44ea6..64bad3c90f 100644
--- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json
@@ -3,7 +3,7 @@
     "warningsAsErrors": true
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Http": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*",
@@ -12,29 +12,22 @@
       "type": "build"
     },
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
-    "Microsoft.Extensions.Logging": "1.1.0-*"
+    "Microsoft.Extensions.Logging": "1.1.0-*",
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
+      "imports": "dotnet5.4",
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
     },
-    "net451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      }
-    }
+    "net451": {}
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json
index de020d37f5..29cf9a2f97 100644
--- a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json
@@ -3,7 +3,7 @@
     "warningsAsErrors": true
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Mvc": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.Localization": "1.1.0-*",
@@ -11,29 +11,22 @@
       "version": "1.1.0-*",
       "type": "build"
     },
-    "Microsoft.AspNetCore.Testing": "1.1.0-*"
+    "Microsoft.AspNetCore.Testing": "1.1.0-*",
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
+      "imports": "dotnet5.4",
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
     },
-    "net451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      }
-    }
+    "net451": {}
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json
index f6bf8ea233..d8d51edb81 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Mvc.Core": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*",
@@ -11,7 +11,9 @@
       "type": "build"
     },
     "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.1.0-*",
-    "Microsoft.AspNetCore.Testing": "1.1.0-*"
+    "Microsoft.AspNetCore.Testing": "1.1.0-*",
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "buildOptions": {
@@ -23,34 +25,20 @@
       "include": "TestFiles/**"
     },
     "compile": {
-      "include": "**/*.cs",
-      "exclude": [
-        "TestFiles/**",
-        "bin",
-        "obj"
-      ]
+      "exclude": "TestFiles/**"
     }
   },
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
+      "imports": "dotnet5.4",
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
     },
-    "net451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      }
-    }
+    "net451": {}
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json
index 106cab6cdd..43f1615198 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json
@@ -13,7 +13,7 @@
     }
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Http": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.1.0-*",
@@ -30,29 +30,22 @@
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.1.0-*",
     "Microsoft.Extensions.DiagnosticAdapter": "1.1.0-*",
-    "Microsoft.Extensions.Logging.Testing": "1.1.0-*"
+    "Microsoft.Extensions.Logging.Testing": "1.1.0-*",
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
+      "imports": "dotnet5.4",
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
     },
-    "net451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      }
-    }
+    "net451": {}
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json
index 90bd334830..bf38893765 100644
--- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json
@@ -4,7 +4,7 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Http": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*",
@@ -15,29 +15,22 @@
     },
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
     "Microsoft.Extensions.Logging.Abstractions": "1.1.0-*",
-    "Microsoft.Extensions.Logging.Testing": "1.1.0-*"
+    "Microsoft.Extensions.Logging.Testing": "1.1.0-*",
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
+      "imports": "dotnet5.4",
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
     },
-    "net451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      }
-    }
+    "net451": {}
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Test/project.json
index 39089d39d0..55588ac895 100644
--- a/test/Microsoft.AspNetCore.Mvc.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Test/project.json
@@ -3,34 +3,27 @@
     "warningsAsErrors": true
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Mvc": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.1.0-*",
     "Microsoft.Extensions.Logging": "1.1.0-*",
-    "xunit": "2.1.0"
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
+      "imports": "dotnet5.4",
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
-        "System.Diagnostics.TraceSource": "4.0.0-*"
+        "System.Diagnostics.TraceSource": "4.0.0-*",
+        "System.Xml.XmlDocument": "4.0.1-*"
       }
     },
-    "net451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      }
-    }
+    "net451": {}
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json
index aca8db4a37..611da03eaf 100644
--- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json
@@ -4,7 +4,7 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Http": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.1.0-*",
@@ -19,29 +19,22 @@
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.1.0-*",
     "Microsoft.Extensions.DiagnosticAdapter": "1.1.0-*",
-    "Microsoft.Extensions.Logging.Testing": "1.1.0-*"
+    "Microsoft.Extensions.Logging.Testing": "1.1.0-*",
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
+      "imports": "dotnet5.4",
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
     },
-    "net451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      }
-    }
+    "net451": {}
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json
index 7fcdf9a70e..f8b3be8d96 100644
--- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json
@@ -3,22 +3,20 @@
     "warningsAsErrors": true
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Http": "1.1.0-*",
     "Microsoft.AspNetCore.Mvc.WebApiCompatShim": "1.1.0-*",
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
     "Microsoft.Extensions.Logging.Testing": "1.1.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.1.0-*",
-    "xunit": "2.1.0"
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
   "frameworks": {
     "netcoreapp1.0": {
       "imports": [
-        "dnxcore50",
+        "dotnet5.4",
         "portable-net451+win8"
       ],
       "dependencies": {
@@ -26,19 +24,9 @@
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
     },
-    "net451": {
-      "frameworkAssemblies": {
-        "System.Reflection": "",
-        "System.Threading.Tasks": ""
-      },
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      }
-    }
+    "net451": {}
   }
 }
\ No newline at end of file