diff --git a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json
index d10bac70ad..9e61b607f6 100644
--- a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json
@@ -10,24 +10,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
diff --git a/test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json b/test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json
index a4eb37611b..1b4695835c 100644
--- a/test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json
@@ -7,24 +7,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
diff --git a/test/Microsoft.AspNetCore.Http.Features.Tests/project.json b/test/Microsoft.AspNetCore.Http.Features.Tests/project.json
index f869ca29fc..3983cc014a 100644
--- a/test/Microsoft.AspNetCore.Http.Features.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Http.Features.Tests/project.json
@@ -5,24 +5,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
diff --git a/test/Microsoft.AspNetCore.Http.Tests/project.json b/test/Microsoft.AspNetCore.Http.Tests/project.json
index aac8b65b40..8993408d3c 100644
--- a/test/Microsoft.AspNetCore.Http.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Http.Tests/project.json
@@ -5,24 +5,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
diff --git a/test/Microsoft.AspNetCore.Owin.Tests/project.json b/test/Microsoft.AspNetCore.Owin.Tests/project.json
index 73df7a8724..2175effd71 100644
--- a/test/Microsoft.AspNetCore.Owin.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Owin.Tests/project.json
@@ -7,24 +7,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
diff --git a/test/Microsoft.AspNetCore.WebUtilities.Tests/project.json b/test/Microsoft.AspNetCore.WebUtilities.Tests/project.json
index 7320aa0841..89df6bf2bc 100644
--- a/test/Microsoft.AspNetCore.WebUtilities.Tests/project.json
+++ b/test/Microsoft.AspNetCore.WebUtilities.Tests/project.json
@@ -8,10 +8,14 @@
     "warningsAsErrors": true
   },
   "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
   "frameworks": {
+    "dnxcore50": {
+      "dependencies": {
+        "System.Text.Encoding.Extensions": "4.0.11-*",
+        "dotnet-test-xunit": "1.0.0-dev-*"
+      },
+      "imports": "portable-net451+win8"
+    },
     "dnx451": {
       "frameworkAssemblies": {
         "System.Runtime": "",
@@ -20,13 +24,6 @@
       "dependencies": {
         "xunit.runner.console": "2.1.0"
       }
-    },
-    "dnxcore50": {
-      "dependencies": {
-        "System.Text.Encoding.Extensions": "4.0.11-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      },
-      "imports": "portable-net451+win8"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/test/Microsoft.Net.Http.Headers.Tests/project.json b/test/Microsoft.Net.Http.Headers.Tests/project.json
index 77979fd57c..4e379068e6 100644
--- a/test/Microsoft.Net.Http.Headers.Tests/project.json
+++ b/test/Microsoft.Net.Http.Headers.Tests/project.json
@@ -6,24 +6,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