diff --git a/src/Microsoft.AspNetCore.WebSockets.Client/project.json b/src/Microsoft.AspNetCore.WebSockets.Client/project.json
index d18ae99dd3..366d975e4c 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Client/project.json
+++ b/src/Microsoft.AspNetCore.WebSockets.Client/project.json
@@ -1,14 +1,18 @@
 {
   "version": "0.1.0-*",
   "description": "Client for communicating over web sockets.",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/websockets"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/websockets"
+    }
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
   "dependencies": {
diff --git a/src/Microsoft.AspNetCore.WebSockets.Protocol/project.json b/src/Microsoft.AspNetCore.WebSockets.Protocol/project.json
index 00c07d05b1..1b903abe23 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Protocol/project.json
+++ b/src/Microsoft.AspNetCore.WebSockets.Protocol/project.json
@@ -1,11 +1,13 @@
 {
   "version": "0.1.0-*",
   "description": "Managed web socket protocol parser.",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/websockets"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/websockets"
+    }
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
diff --git a/src/Microsoft.AspNetCore.WebSockets.Server/project.json b/src/Microsoft.AspNetCore.WebSockets.Server/project.json
index d4bc37161a..ffef0488f2 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Server/project.json
+++ b/src/Microsoft.AspNetCore.WebSockets.Server/project.json
@@ -1,6 +1,6 @@
 {
   "version": "0.1.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -9,9 +9,11 @@
     "xmlDoc": true
   },
   "description": "ASP.NET 5 web socket middleware for use on top of opaque servers.",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/websockets"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/websockets"
+    }
   },
   "dependencies": {
     "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*",
diff --git a/test/AutobahnTestClient/project.json b/test/AutobahnTestClient/project.json
index d2c57323b1..bb1d1e8084 100644
--- a/test/AutobahnTestClient/project.json
+++ b/test/AutobahnTestClient/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "dependencies": {
diff --git a/test/AutobahnTestServer/project.json b/test/AutobahnTestServer/project.json
index bffe72ff47..0c58351c19 100644
--- a/test/AutobahnTestServer/project.json
+++ b/test/AutobahnTestServer/project.json
@@ -5,7 +5,7 @@
     "Microsoft.AspNetCore.WebSockets.Server": "0.1.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "frameworks": {
@@ -25,7 +25,9 @@
     },
     "net451": {}
   },
-  "content": [
-    "hosting.json"
-  ]
+  "publishOptions": {
+    "include": [
+      "hosting.json"
+    ]
+  }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/project.json b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/project.json
index 5ef4b2e69e..a5c6ce28b1 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/project.json
+++ b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/project.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.WebSockets.Protocol": "0.1.0-*",
     "xunit": "2.1.0"
@@ -12,7 +13,6 @@
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       },
       "imports": [