diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json
index 59e444b0ae..a0f3fba47c 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json
+++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json
@@ -9,10 +9,13 @@
     "xunit": "2.1.0"
   },
   "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
   "frameworks": {
+    "dnxcore50": {
+      "dependencies": {
+        "dotnet-test-xunit": "1.0.0-dev-*"
+      },
+      "imports": "portable-net451+win8"
+    },
     "dnx451": {
       "frameworkAssemblies": {
         "System.Runtime": "",
@@ -21,12 +24,6 @@
       "dependencies": {
         "xunit.runner.console": "2.1.0"
       }
-    },
-    "dnxcore50": {
-      "dependencies": {
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      },
-      "imports": "portable-net451+win8"
     }
   },
   "compilationOptions": {
diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json
index 15652c7d23..53270435a8 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json
@@ -14,10 +14,14 @@
     "../Shared/TestHelpers.cs"
   ],
   "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
   "frameworks": {
+    "dnxcore50": {
+      "dependencies": {
+        "moq.netcore": "4.4.0-beta8",
+        "dotnet-test-xunit": "1.0.0-dev-*"
+      },
+      "imports": "portable-net451+win8"
+    },
     "dnx451": {
       "frameworkAssemblies": {
         "System.Runtime": "",
@@ -27,13 +31,6 @@
         "Moq": "4.2.1312.1622",
         "xunit.runner.console": "2.1.0"
       }
-    },
-    "dnxcore50": {
-      "dependencies": {
-        "moq.netcore": "4.4.0-beta8",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      },
-      "imports": "portable-net451+win8"
     }
   }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json
index 0e9d6c3cb2..6688a3d243 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json
+++ b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json
@@ -1,7 +1,4 @@
-{
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
+{
   "dependencies": {
     "DatabaseErrorPageSample": "1.0.0",
     "DeveloperExceptionPageSample": "1.0.0",
@@ -25,10 +22,13 @@
     "bower_components"
   ],
   "frameworks": {
-    "dnx451": {},
     "dnxcore50": {
-      "imports": "portable-net451+win8"
-    }
+      "imports": "portable-net451+win8",
+      "dependencies": {
+        "dotnet-test-xunit": "1.0.0-dev-*"
+      }
+    },
+    "dnx451": {}
   },
   "publishExclude": [
     "**.user",
diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json b/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json
index d1acd2a254..2629bb42a1 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json
@@ -14,6 +14,13 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
+    "dnxcore50": {
+      "dependencies": {
+        "moq.netcore": "4.4.0-beta8",
+        "dotnet-test-xunit": "1.0.0-dev-*"
+      },
+      "imports": "portable-net451+win8"
+    },
     "dnx451": {
       "frameworkAssemblies": {
         "System.Runtime": "",
@@ -23,19 +30,9 @@
         "Moq": "4.2.1312.1622",
         "xunit.runner.console": "2.1.0"
       }
-    },
-    "dnxcore50": {
-      "dependencies": {
-        "moq.netcore": "4.4.0-beta8",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      },
-      "imports": "portable-net451+win8"
     }
   },
   "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
   "content": [
     "TestFiles/**/*"
   ],
diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json
index e4132f915d..58cdc213c5 100644
--- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json
+++ b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json
@@ -13,24 +13,21 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
+    "dnxcore50": {
+      "dependencies": {
+        "dotnet-test-xunit": "1.0.0-dev-*"
+      },
+      "imports": "portable-net451+win8"
+    },
     "dnx451": {
-     "frameworkAssemblies": {
+      "frameworkAssemblies": {
         "System.Runtime": "",
         "System.Threading.Tasks": ""
       },
       "dependencies": {
         "xunit.runner.console": "2.1.0"
       }
-    },
-    "dnxcore50": { 
-      "dependencies": {
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      },
-      "imports": "portable-net451+win8"
     }
   },
-  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  }
-}
+  "testRunner": "xunit"
+}
\ No newline at end of file