diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/DbUtil.cs b/test/Microsoft.AspNet.Identity.EntityFramework.Test/DbUtil.cs
index eb6fa14c8b..75b15d935c 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/DbUtil.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/DbUtil.cs
@@ -5,8 +5,6 @@ using Microsoft.AspNet.Hosting;
 using Microsoft.Data.Entity;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.DependencyInjection.Fallback;
-using Microsoft.Framework.Logging;
-using Microsoft.Framework.OptionsModel;
 using Xunit;
 
 namespace Microsoft.AspNet.Identity.EntityFramework.Test
@@ -25,10 +23,8 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
             {
                 services = new ServiceCollection();
             }
-            services.Add(HostingServices.GetDefaultServices());
+            services.AddHosting();
             services.AddEntityFramework().AddSqlServer().AddDbContext<TContext>(options => options.UseSqlServer(connectionString));
-            services.Add(OptionsServices.GetDefaultServices());
-            services.AddInstance<ILoggerFactory>(new LoggerFactory());
             return services;
         }
 
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/DefaultPocoTest.cs b/test/Microsoft.AspNet.Identity.EntityFramework.Test/DefaultPocoTest.cs
index 475d4133b1..aaaeba651c 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/DefaultPocoTest.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/DefaultPocoTest.cs
@@ -49,7 +49,6 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
             builder.UseServices(services =>
             {
                 DbUtil.ConfigureDbServices<IdentityDbContext>(ConnectionString, services);
-                services.Add(DataProtectionServices.GetDefaultServices());
                 services.AddIdentity<IdentityUser, IdentityRole>().AddEntityFrameworkStores<IdentityDbContext>();
             });
 
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreTest.cs b/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreTest.cs
index 86ba3eafc9..431d8cd1a3 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreTest.cs
@@ -54,7 +54,6 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
             builder.UseServices(services =>
             {
                 DbUtil.ConfigureDbServices<ApplicationDbContext>(ConnectionString, services);
-                services.Add(DataProtectionServices.GetDefaultServices());
                 services.AddIdentity<ApplicationUser, IdentityRole>().AddEntityFrameworkStores<ApplicationDbContext>();
             });
 
@@ -79,8 +78,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
 
             builder.UseServices(services =>
             {
-                services.AddInstance<ILoggerFactory>(new LoggerFactory());
-                services.Add(HostingServices.GetDefaultServices());
+                services.AddHosting();
                 services.AddEntityFramework()
                         .AddSqlServer()
                         .AddDbContext<ApplicationDbContext>(options => options.UseSqlServer(ConnectionString));
diff --git a/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs b/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs
index c56a000d74..fd37a4c209 100644
--- a/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs
+++ b/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs
@@ -67,7 +67,6 @@ namespace Microsoft.AspNet.Identity.Test
         {
             var services = new ServiceCollection();
             services.AddIdentity();
-            services.Add(OptionsServices.GetDefaultServices());
 
             var provider = services.BuildServiceProvider();
             var userValidator = provider.GetRequiredService<IUserValidator<IdentityUser>>() as UserValidator<IdentityUser>;
@@ -85,8 +84,6 @@ namespace Microsoft.AspNet.Identity.Test
         {
             var services = new ServiceCollection();
             services.AddIdentity().AddDefaultTokenProviders();
-            services.Add(DataProtectionServices.GetDefaultServices());
-            services.Add(OptionsServices.GetDefaultServices());
 
             var provider = services.BuildServiceProvider();
             var tokenProviders = provider.GetRequiredService<IEnumerable<IUserTokenProvider<IdentityUser>>>();
diff --git a/test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs b/test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs
index a5fa3162f0..908c73ff82 100644
--- a/test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs
+++ b/test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs
@@ -67,7 +67,7 @@ namespace Microsoft.AspNet.Identity.Test
             var config = new Configuration { new MemoryConfigurationSource(dic) };
             Assert.Equal(roleClaimType, config.Get("identity:claimsidentity:roleclaimtype"));
 
-            var services = new ServiceCollection {OptionsServices.GetDefaultServices()};
+            var services = new ServiceCollection();
             if (useDefaultSubKey)
             {
                 services.AddIdentity(config);
@@ -103,7 +103,7 @@ namespace Microsoft.AspNet.Identity.Test
                 {"identity:lockout:MaxFailedAccessAttempts", "1000"}
             };
             var config = new Configuration { new MemoryConfigurationSource(dic) };
-            var services = new ServiceCollection { OptionsServices.GetDefaultServices() };
+            var services = new ServiceCollection();
             services.AddIdentity(config, 
                 o => { o.User.RequireUniqueEmail = false; o.Lockout.MaxFailedAccessAttempts++; });
             var accessor = services.BuildServiceProvider().GetRequiredService<IOptions<IdentityOptions>>();
@@ -148,6 +148,7 @@ namespace Microsoft.AspNet.Identity.Test
             var app = new ApplicationBuilder(CallContextServiceLocator.Locator.ServiceProvider);
             app.UseServices(services =>
             {
+                services.AddOptions();
                 services.ConfigureIdentity(options => options.User.RequireUniqueEmail = true);
             });
 
diff --git a/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs b/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs
index daafaf8b19..879834f320 100644
--- a/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs
+++ b/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs
@@ -30,10 +30,10 @@ namespace Microsoft.AspNet.Identity.Test
         [Fact]
         public void EnsureDefaultServicesDefaultsWithStoreWorks()
         {
-            var services = new ServiceCollection {IdentityServices.GetDefaultServices<TestUser, IdentityRole>()};
-            services.Add(OptionsServices.GetDefaultServices());
-            services.AddTransient<IUserStore<TestUser>, NoopUserStore>();
-            services.AddTransient<TestManager>();
+            var services = new ServiceCollection()
+                    .AddTransient<IUserStore<TestUser>, NoopUserStore>()
+                    .AddTransient<TestManager>();
+            services.AddIdentity<TestUser, IdentityRole>();
             var manager = services.BuildServiceProvider().GetRequiredService<TestManager>();
             Assert.NotNull(manager.PasswordHasher);
             Assert.NotNull(manager.PasswordValidator);
diff --git a/test/Shared/UserManagerTestBase.cs b/test/Shared/UserManagerTestBase.cs
index a0918c92d7..46c31e3f90 100644
--- a/test/Shared/UserManagerTestBase.cs
+++ b/test/Shared/UserManagerTestBase.cs
@@ -9,7 +9,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Testing;
 using Xunit;
-using Microsoft.AspNet.Security.DataProtection;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.DependencyInjection.Fallback;
 
@@ -28,9 +27,7 @@ namespace Microsoft.AspNet.Identity.Test
     {
         protected virtual void SetupIdentityServices(IServiceCollection services, object context = null)
         {
-            services.AddOptions();
             services.AddHosting();
-            services.Add(DataProtectionServices.GetDefaultServices());
             services.AddIdentity<TUser, TRole>().AddDefaultTokenProviders();
             AddUserStore(services, context);
             AddRoleStore(services, context);