diff --git a/src/Microsoft.AspNet.Identity.Entity/IdentityContext.cs b/src/Microsoft.AspNet.Identity.Entity/IdentityContext.cs
index 16c758cc3b..a9d84b81b3 100644
--- a/src/Microsoft.AspNet.Identity.Entity/IdentityContext.cs
+++ b/src/Microsoft.AspNet.Identity.Entity/IdentityContext.cs
@@ -16,12 +16,12 @@
 // permissions and limitations under the License.
 
 using System;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.DependencyInjection.Fallback;
 using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.SqlServer;
 using Microsoft.Data.Entity.InMemory;
 using Microsoft.Data.Entity.Metadata;
+using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.DependencyInjection.Fallback;
 
 namespace Microsoft.AspNet.Identity.Entity
 {
diff --git a/src/Microsoft.AspNet.Identity.Entity/project.json b/src/Microsoft.AspNet.Identity.Entity/project.json
index 073d924609..1f945f9260 100644
--- a/src/Microsoft.AspNet.Identity.Entity/project.json
+++ b/src/Microsoft.AspNet.Identity.Entity/project.json
@@ -1,13 +1,13 @@
 {
   "version": "0.1-alpha-*",
   "dependencies": {
-    "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
-    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
     "Microsoft.AspNet.Identity": "",
     "Microsoft.Data.Entity": "0.1-alpha-*",
     "Microsoft.Data.Entity.Relational": "0.1-alpha-*",
     "Microsoft.Data.Entity.SqlServer": "0.1-alpha-*",
     "Microsoft.Data.Entity.InMemory": "0.1-alpha-*",
+    "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
+    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
     "System.Security.Claims" : "0.1-alpha-*"
   },
   "configurations": {
diff --git a/src/Microsoft.AspNet.Identity.Security/SignInManager.cs b/src/Microsoft.AspNet.Identity.Security/SignInManager.cs
index e21dc27d70..2f64e33170 100644
--- a/src/Microsoft.AspNet.Identity.Security/SignInManager.cs
+++ b/src/Microsoft.AspNet.Identity.Security/SignInManager.cs
@@ -15,12 +15,12 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-using Microsoft.Framework.DependencyInjection;
 using System;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Security;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Identity.Security
 {
diff --git a/src/Microsoft.AspNet.Identity.Security/project.json b/src/Microsoft.AspNet.Identity.Security/project.json
index d7d14ee4f3..f7fe0eb2f8 100644
--- a/src/Microsoft.AspNet.Identity.Security/project.json
+++ b/src/Microsoft.AspNet.Identity.Security/project.json
@@ -1,11 +1,11 @@
 {
   "version": "0.1-alpha-*",
   "dependencies": {
-    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
     "System.Security.Claims" : "0.1-alpha-*",
     "Microsoft.AspNet.Http" : "0.1-alpha-*",
     "Microsoft.AspNet.Identity" : "",
-    "Microsoft.AspNet.Security.DataProtection" : "0.1-alpha-*"
+    "Microsoft.AspNet.Security.DataProtection" : "0.1-alpha-*",
+    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*"
   },
   "configurations": {
     "net45": {},
diff --git a/src/Microsoft.AspNet.Identity/IdentityServices.cs b/src/Microsoft.AspNet.Identity/IdentityServices.cs
index 0c031ede10..54b5ed6598 100644
--- a/src/Microsoft.AspNet.Identity/IdentityServices.cs
+++ b/src/Microsoft.AspNet.Identity/IdentityServices.cs
@@ -15,10 +15,10 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-using Microsoft.Framework.ConfigurationModel;
-using Microsoft.Framework.DependencyInjection;
 using System;
 using System.Collections.Generic;
+using Microsoft.Framework.ConfigurationModel;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Identity
 {
diff --git a/src/Microsoft.AspNet.Identity/project.json b/src/Microsoft.AspNet.Identity/project.json
index 0094995340..3e2b993852 100644
--- a/src/Microsoft.AspNet.Identity/project.json
+++ b/src/Microsoft.AspNet.Identity/project.json
@@ -1,10 +1,10 @@
 {
   "version": "0.1-alpha-*",
   "dependencies": {
-    "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
-    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
     "Microsoft.AspNet.HttpFeature" : "0.1-alpha-*",
     "Microsoft.AspNet.Security.DataProtection" : "0.1-alpha-*",
+    "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
+    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
     "System.Security.Claims" : "0.1-alpha-*"
   },
   "configurations": {
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs b/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs
index 696dd2a27c..6cc6073e2e 100644
--- a/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.Entity.Test/RoleStoreTest.cs
@@ -17,10 +17,10 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.DependencyInjection.Fallback;
 using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.InMemory;
+using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.DependencyInjection.Fallback;
 using Xunit;
 
 namespace Microsoft.AspNet.Identity.Entity.Test
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs b/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs
index b1b26ec9b8..df4c0867a3 100644
--- a/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs
+++ b/test/Microsoft.AspNet.Identity.Entity.Test/StartupTest.cs
@@ -1,8 +1,8 @@
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.DependencyInjection.Fallback;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Identity.Entity;
 using Microsoft.AspNet.PipelineCore;
+using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.DependencyInjection.Fallback;
 using System;
 using System.Threading.Tasks;
 using Microsoft.Data.Entity;
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/TestIdentityFactory.cs b/test/Microsoft.AspNet.Identity.Entity.Test/TestIdentityFactory.cs
index 20af156d26..9355ad31a3 100644
--- a/test/Microsoft.AspNet.Identity.Entity.Test/TestIdentityFactory.cs
+++ b/test/Microsoft.AspNet.Identity.Entity.Test/TestIdentityFactory.cs
@@ -16,12 +16,12 @@
 // permissions and limitations under the License.
 
 using Microsoft.AspNet.Testing;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.DependencyInjection.Fallback;
 using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.Metadata;
 using Microsoft.Data.Entity.Storage;
 using Microsoft.Data.Entity.InMemory;
+using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.DependencyInjection.Fallback;
 using System;
 using System.Linq;
 using System.Security.Claims;
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/UserStoreTest.cs b/test/Microsoft.AspNet.Identity.Entity.Test/UserStoreTest.cs
index e0991ae7dc..f8d15188be 100644
--- a/test/Microsoft.AspNet.Identity.Entity.Test/UserStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.Entity.Test/UserStoreTest.cs
@@ -15,13 +15,13 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.DependencyInjection.Fallback;
 using Microsoft.AspNet.Testing;
 using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.Metadata;
 using Microsoft.Data.Entity.InMemory;
 using Microsoft.Data.Entity.SqlServer;
+using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.DependencyInjection.Fallback;
 using System;
 using System.Linq;
 using System.Security.Claims;
diff --git a/test/Microsoft.AspNet.Identity.Entity.Test/project.json b/test/Microsoft.AspNet.Identity.Entity.Test/project.json
index c855d91486..bddadaef69 100644
--- a/test/Microsoft.AspNet.Identity.Entity.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.Entity.Test/project.json
@@ -2,15 +2,15 @@
   "version": "0.1-alpha-*",
   "dependencies": {
     "Microsoft.AspNet.Http": "0.1-alpha-*",
-    "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
-    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
     "Microsoft.AspNet.Identity.Entity": "",
     "Microsoft.AspNet.PipelineCore": "0.1-alpha-*",
-    "Microsoft.Framework.Logging": "0.1-alpha-*",
     "Microsoft.AspNet.RequestContainer": "0.1-alpha-*",
     "Microsoft.AspNet.Security.DataProtection": "0.1-alpha-*",
     "Microsoft.AspNet.Testing": "0.1-alpha-*",
     "Microsoft.Bcl.Immutable": "1.1.18-beta-*",
+    "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
+    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
+    "Microsoft.Framework.Logging": "0.1-alpha-*",
     "System.Security.Claims": "0.1-alpha-*",
     "Xunit.KRunner": "0.1-alpha-*",
     "xunit.abstractions": "2.0.0-aspnet-*",
diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs b/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs
index 4ee266d2ea..b37e8b2f16 100644
--- a/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs
@@ -20,9 +20,9 @@ using System.Linq;
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Identity.Test;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.DependencyInjection.Fallback;
-using Microsoft.AspNet.Identity.Test;
 
 namespace Microsoft.AspNet.Identity.InMemory.Test
 {
diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs b/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs
index 0bd2e7c733..5f4696606a 100644
--- a/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs
+++ b/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs
@@ -18,11 +18,11 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.DependencyInjection.Fallback;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Identity.Test;
 using Microsoft.AspNet.PipelineCore;
+using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.DependencyInjection.Fallback;
 using Xunit;
 
 namespace Microsoft.AspNet.Identity.InMemory.Test
diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/project.json b/test/Microsoft.AspNet.Identity.InMemory.Test/project.json
index 251c086a9e..1e87cb307d 100644
--- a/test/Microsoft.AspNet.Identity.InMemory.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.InMemory.Test/project.json
@@ -2,13 +2,13 @@
   "version": "0.1-alpha-*",
   "dependencies": {
     "Microsoft.AspNet.Http" : "0.1-alpha-*",
-    "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
-    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
     "Microsoft.AspNet.Identity" : "0.1-alpha-*",
     "Microsoft.AspNet.Identity.InMemory" : "0.1-alpha-*",
     "Microsoft.AspNet.PipelineCore" : "0.1-alpha-*",
     "Microsoft.AspNet.RequestContainer" : "0.1-alpha-*",
     "Microsoft.AspNet.Testing" : "0.1-alpha-*",
+    "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
+    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
     "Xunit.KRunner": "0.1-alpha-*",
     "xunit.abstractions": "2.0.0-aspnet-*",
     "xunit.assert": "2.0.0-aspnet-*",
diff --git a/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs b/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs
index 1b63402d38..147cc394d1 100644
--- a/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs
+++ b/test/Microsoft.AspNet.Identity.Security.Test/SignInManagerTest.cs
@@ -17,16 +17,16 @@
 
 using System;
 using System.Threading;
-using Microsoft.Framework.DependencyInjection.Fallback;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Security;
 using Microsoft.AspNet.Identity.InMemory;
 using Microsoft.AspNet.Identity.Test;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Logging;
 using Microsoft.AspNet.PipelineCore;
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Security.Cookies;
+using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.DependencyInjection.Fallback;
+using Microsoft.Framework.Logging;
 using Moq;
 using System.Security.Claims;
 using System.Threading.Tasks;
diff --git a/test/Microsoft.AspNet.Identity.Security.Test/project.json b/test/Microsoft.AspNet.Identity.Security.Test/project.json
index b7bfa6c801..7ae86c91e3 100644
--- a/test/Microsoft.AspNet.Identity.Security.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.Security.Test/project.json
@@ -2,12 +2,9 @@
   "version": "0.1-alpha-*",
   "dependencies": {
     "Microsoft.AspNet.Http" : "0.1-alpha-*",
-    "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
-    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
     "Microsoft.AspNet.Identity" : "0.1-alpha-*",
     "Microsoft.AspNet.Identity.InMemory" : "0.1-alpha-*",
     "Microsoft.AspNet.Identity.Security" : "0.1-alpha-*",
-    "Microsoft.Framework.Logging" : "0.1-alpha-*",
     "Microsoft.AspNet.HttpFeature" : "0.1-alpha-*",
     "Microsoft.AspNet.FeatureModel" : "0.1-alpha-*",
     "Microsoft.AspNet.PipelineCore" : "0.1-alpha-*",
@@ -15,6 +12,9 @@
     "Microsoft.AspNet.Security" : "0.1-alpha-*",
     "Microsoft.AspNet.Security.Cookies" : "0.1-alpha-*",
     "Microsoft.AspNet.Testing" : "0.1-alpha-*",
+    "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
+    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
+    "Microsoft.Framework.Logging" : "0.1-alpha-*",
     "System.Security.Claims" : "0.1-alpha-*",
     "Xunit.KRunner": "0.1-alpha-*",
     "xunit.abstractions": "2.0.0-aspnet-*",
diff --git a/test/Microsoft.AspNet.Identity.Test/project.json b/test/Microsoft.AspNet.Identity.Test/project.json
index f785f71cba..55097df422 100644
--- a/test/Microsoft.AspNet.Identity.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.Test/project.json
@@ -1,10 +1,10 @@
 {
   "version": "0.1-alpha-*",
   "dependencies": {
-    "Microsoft.Framework.ConfigurationModel" : "0.1-alpha-*",
-    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
     "Microsoft.AspNet.Identity" : "0.1-alpha-*",
     "Microsoft.AspNet.Testing" : "0.1-alpha-*",
+    "Microsoft.Framework.ConfigurationModel" : "0.1-alpha-*",
+    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
     "Xunit.KRunner": "0.1-alpha-*",
     "xunit.abstractions": "2.0.0-aspnet-*",
     "xunit.assert": "2.0.0-aspnet-*",
diff --git a/test/Shared/UserManagerTestBase.cs b/test/Shared/UserManagerTestBase.cs
index 66a41e4102..58f8788469 100644
--- a/test/Shared/UserManagerTestBase.cs
+++ b/test/Shared/UserManagerTestBase.cs
@@ -3,10 +3,10 @@ using System.Linq;
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.DependencyInjection.Fallback;
 using Microsoft.AspNet.Identity.Test;
 using Microsoft.AspNet.Testing;
+using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.DependencyInjection.Fallback;
 using Xunit;
 
 namespace Microsoft.AspNet.Identity.Test