diff --git a/src/Microsoft.AspNet.Mvc.Core/project.json b/src/Microsoft.AspNet.Mvc.Core/project.json
index f9161def7d..85e3de843c 100644
--- a/src/Microsoft.AspNet.Mvc.Core/project.json
+++ b/src/Microsoft.AspNet.Mvc.Core/project.json
@@ -10,7 +10,7 @@
     "Microsoft.AspNet.Cors.Core": "1.0.0-*",
     "Microsoft.AspNet.DataProtection": "1.0.0-*",
     "Microsoft.AspNet.Diagnostics.Interfaces": "1.0.0-*",
-    "Microsoft.AspNet.FileProviders": "1.0.0-*",
+    "Microsoft.AspNet.FileProviders.Interfaces": "1.0.0-*",
     "Microsoft.AspNet.Hosting.Interfaces": "1.0.0-*",
     "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
     "Microsoft.AspNet.Mvc.Common": { "version": "6.0.0-*", "type": "build" },
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json
index 078c2f699c..59a3b290be 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json
@@ -5,7 +5,7 @@
         "warningsAsErrors": true
     },
     "dependencies": {
-        "Microsoft.AspNet.FileProviders": "1.0.0-*",
+        "Microsoft.AspNet.FileProviders.Physical": "1.0.0-*",
         "Microsoft.AspNet.Mvc.Common": { "version": "6.0.0-*", "type": "build" },
         "Microsoft.AspNet.Razor.Runtime": "4.0.0-*",
         "Microsoft.Framework.Caching.Memory": "1.0.0-*",
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
index aa5c0341a9..a3270272d5 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
@@ -3,7 +3,7 @@
         "warningsAsErrors": "true"
     },
     "dependencies": {
-        "Microsoft.AspNet.FileProviders": "1.0.0-*",
+        "Microsoft.AspNet.FileProviders.Interfaces": "1.0.0-*",
         "Microsoft.AspNet.Mvc.ModelBinding": "6.0.0-*",
         "Microsoft.AspNet.Mvc.TestCommon": { "version": "6.0.0-*", "type": "build" },
         "Microsoft.AspNet.Testing": "1.0.0-*",
diff --git a/test/Microsoft.AspNet.Mvc.TestCommon/TestFileProvider.cs b/test/Microsoft.AspNet.Mvc.TestCommon/TestFileProvider.cs
index 454f3af187..0371471d26 100644
--- a/test/Microsoft.AspNet.Mvc.TestCommon/TestFileProvider.cs
+++ b/test/Microsoft.AspNet.Mvc.TestCommon/TestFileProvider.cs
@@ -54,7 +54,7 @@ namespace Microsoft.AspNet.Mvc.Razor
             }
             else
             {
-                return new NotFoundFileInfo(subpath);
+                return new NotFoundFileInfo();
             }
         }
 
@@ -74,5 +74,61 @@ namespace Microsoft.AspNet.Mvc.Razor
         {
             return _fileTriggers[filter];
         }
+
+        private class NotFoundFileInfo : IFileInfo
+        {
+            public bool Exists
+            {
+                get
+                {
+                    return false;
+                }
+            }
+
+            public bool IsDirectory
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public DateTimeOffset LastModified
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public long Length
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public string Name
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public string PhysicalPath
+            {
+                get
+                {
+                    throw new NotImplementedException();
+                }
+            }
+
+            public Stream CreateReadStream()
+            {
+                throw new NotImplementedException();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/test/WebSites/FilesWebSite/project.json b/test/WebSites/FilesWebSite/project.json
index f99d40075e..1352a364a1 100644
--- a/test/WebSites/FilesWebSite/project.json
+++ b/test/WebSites/FilesWebSite/project.json
@@ -6,6 +6,7 @@
     "resources": "EmbeddedResources/**",
     "dependencies": {
         "Kestrel": "1.0.0-*",
+        "Microsoft.AspNet.FileProviders.Embedded": "1.0.0-*",
         "Microsoft.AspNet.Mvc": "6.0.0-*",
         "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0",
         "Microsoft.AspNet.Server.IIS": "1.0.0-*",
diff --git a/test/WebSites/RazorEmbeddedViewsWebSite/project.json b/test/WebSites/RazorEmbeddedViewsWebSite/project.json
index a20624da82..2a10f79961 100644
--- a/test/WebSites/RazorEmbeddedViewsWebSite/project.json
+++ b/test/WebSites/RazorEmbeddedViewsWebSite/project.json
@@ -6,6 +6,7 @@
     "resources": "EmbeddedResources/**",
     "dependencies": {
         "Kestrel": "1.0.0-*",
+        "Microsoft.AspNet.FileProviders.Embedded": "1.0.0-*",
         "Microsoft.AspNet.Mvc": "6.0.0-*",
         "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0",
         "Microsoft.AspNet.Server.IIS": "1.0.0-*",