diff --git a/src/Microsoft.AspNet.Razor.Runtime.VSRC1/project.json b/src/Microsoft.AspNet.Razor.Runtime.VSRC1/project.json
index 5dd579771c..76d4709f4c 100644
--- a/src/Microsoft.AspNet.Razor.Runtime.VSRC1/project.json
+++ b/src/Microsoft.AspNet.Razor.Runtime.VSRC1/project.json
@@ -1,13 +1,15 @@
 {
   "description": "Runtime components for rendering Razor pages.",
   "version": "4.0.0-rc1-final",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/razor"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/razor"
+    }
   },
   "dependencies": {
     "Microsoft.AspNet.Html.Abstractions": "1.0.0-rc1-final",
diff --git a/src/Microsoft.AspNet.Razor.VSRC1/project.json b/src/Microsoft.AspNet.Razor.VSRC1/project.json
index b18801b08a..1baaff1fce 100644
--- a/src/Microsoft.AspNet.Razor.VSRC1/project.json
+++ b/src/Microsoft.AspNet.Razor.VSRC1/project.json
@@ -1,15 +1,17 @@
 {
   "description": "Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor parser and code generation infrastructure.",
   "version": "4.0.0-rc1-final",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/razor"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/razor"
+    }
   },
-  "dependencies": { },
+  "dependencies": {},
   "frameworks": {
     "net451": {}
   }
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/project.json b/src/Microsoft.AspNetCore.Razor.Runtime/project.json
index 582457acc2..ed9692ce41 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/project.json
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/project.json
@@ -1,14 +1,7 @@
 {
   "description": "Runtime components for rendering Razor pages and implementing tag helpers.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute\r\nMicrosoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute\r\nMicrosoft.AspNetCore.Razor.TagHelpers.ITagHelper",
-  "tags": [
-    "aspnetcore",
-    "cshtml",
-    "razor",
-    "taghelper",
-    "taghelpers"
-  ],
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "allowUnsafe": true,
     "keyFile": "../../tools/Key.snk",
     "warningsAsErrors": true,
@@ -17,9 +10,18 @@
     ],
     "xmlDoc": true
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/razor"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/razor"
+    },
+    "tags": [
+      "aspnetcore",
+      "cshtml",
+      "razor",
+      "taghelper",
+      "taghelpers"
+    ]
   },
   "dependencies": {
     "Microsoft.AspNetCore.Html.Abstractions": "1.0.0-*",
diff --git a/src/Microsoft.AspNetCore.Razor/project.json b/src/Microsoft.AspNetCore.Razor/project.json
index 4b68b87839..adb60baffc 100644
--- a/src/Microsoft.AspNetCore.Razor/project.json
+++ b/src/Microsoft.AspNetCore.Razor/project.json
@@ -1,12 +1,7 @@
 {
   "description": "Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor parser and code generation infrastructure.",
-  "tags": [
-    "aspnetcore",
-    "cshtml",
-    "razor"
-  ],
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -14,9 +9,16 @@
     ],
     "xmlDoc": true
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/razor"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/razor"
+    },
+    "tags": [
+      "aspnetcore",
+      "cshtml",
+      "razor"
+    ]
   },
   "dependencies": {
     "Microsoft.Extensions.HashCodeCombiner.Sources": {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json b/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json
index e25e3a0018..65e92f042c 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json
@@ -1,10 +1,11 @@
 {
   "version": "1.0.0",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Razor.Runtime": "1.0.0-*",
     "Microsoft.AspNetCore.Razor.Test.Sources": {
@@ -27,7 +28,6 @@
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "dotnet-test-xunit": "1.0.0-*",
         "moq.netcore": "4.4.0-beta8",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
diff --git a/test/Microsoft.AspNetCore.Razor.Test/project.json b/test/Microsoft.AspNetCore.Razor.Test/project.json
index 23fb87e71d..9edea239dc 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/project.json
+++ b/test/Microsoft.AspNetCore.Razor.Test/project.json
@@ -1,7 +1,7 @@
 {
   "version": "1.0.0",
-  "resource": "TestFiles/**/*",
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Razor": "1.0.0-*",
     "Microsoft.AspNetCore.Razor.Test.Sources": {
@@ -25,7 +25,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
@@ -36,16 +35,26 @@
         "System.Threading.Tasks": ""
       },
       "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "xunit.runner.console": "2.1.0"
+        "Moq": "4.2.1312.1622"
       }
     }
   },
-  "compilationOptions": {
+  "buildOptions": {
     "define": [
       "__RemoveThisBitTo__GENERATE_BASELINES"
     ],
     "warningsAsErrors": true,
-    "keyFile": "../../tools/Key.snk"
+    "keyFile": "../../tools/Key.snk",
+    "embed": {
+      "include": "TestFiles/**/*"
+    },
+    "compile": {
+      "include": "**/*.cs",
+      "exclude": [
+        "TestFiles/**/*",
+        "bin",
+        "obj"
+      ]
+    }
   }
 }
\ No newline at end of file