diff --git a/samples/IdentitySample.Mvc/Models/SampleData.cs b/samples/IdentitySample.Mvc/Models/SampleData.cs
index d96cf66945..46d4feb316 100644
--- a/samples/IdentitySample.Mvc/Models/SampleData.cs
+++ b/samples/IdentitySample.Mvc/Models/SampleData.cs
@@ -12,7 +12,7 @@ namespace IdentitySample.Models
     {
         public static async Task InitializeIdentityDatabaseAsync(IServiceProvider serviceProvider)
         {
-            using (var db = serviceProvider.GetService<ApplicationDbContext>())
+            using (var db = serviceProvider.GetRequiredService<ApplicationDbContext>())
             {
                 var sqlServerDataStore = db.Configuration.DataStore as SqlServerDataStore;
                 if (sqlServerDataStore != null)
@@ -36,11 +36,11 @@ namespace IdentitySample.Models
         /// <returns></returns>
         private static async Task CreateAdminUser(IServiceProvider serviceProvider)
         {
-            var options = serviceProvider.GetService<IOptions<IdentityDbContextOptions>>().Options;
+            var options = serviceProvider.GetRequiredService<IOptions<IdentityDbContextOptions>>().Options;
             const string adminRole = "Administrator";
 
-            var userManager = serviceProvider.GetService<UserManager<ApplicationUser>>();
-            var roleManager = serviceProvider.GetService<RoleManager<IdentityRole>>();
+            var userManager = serviceProvider.GetRequiredService<UserManager<ApplicationUser>>();
+            var roleManager = serviceProvider.GetRequiredService<RoleManager<IdentityRole>>();
             if (!await roleManager.RoleExistsAsync(adminRole))
             {
                 await roleManager.CreateAsync(new IdentityRole(adminRole));
diff --git a/src/Microsoft.AspNet.Identity/SecurityStampValidator.cs b/src/Microsoft.AspNet.Identity/SecurityStampValidator.cs
index 9fc9d16af9..755afcf4c2 100644
--- a/src/Microsoft.AspNet.Identity/SecurityStampValidator.cs
+++ b/src/Microsoft.AspNet.Identity/SecurityStampValidator.cs
@@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Identity
         /// <returns></returns>
         public virtual async Task Validate(CookieValidateIdentityContext context, ClaimsIdentity identity)
         {
-            var manager = context.HttpContext.RequestServices.GetService<SignInManager<TUser>>();
+            var manager = context.HttpContext.RequestServices.GetRequiredService<SignInManager<TUser>>();
             var userId = identity.GetUserId();
             var user = await manager.ValidateSecurityStampAsync(identity, userId);
             if (user != null)
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryEFUserStoreTest.cs b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryEFUserStoreTest.cs
index abc427d180..72aa757d62 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryEFUserStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryEFUserStoreTest.cs
@@ -33,7 +33,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
                 options.Password.RequireUppercase = false;
                 options.User.UserNameValidationRegex = null;
             });
-            return services.BuildServiceProvider().GetService<UserManager<IdentityUser>>();
+            return services.BuildServiceProvider().GetRequiredService<UserManager<IdentityUser>>();
         }
 
         protected override RoleManager<IdentityRole> CreateRoleManager(object context)
@@ -46,7 +46,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
             services.Add(OptionsServices.GetDefaultServices());
             services.AddEntityFramework().AddInMemoryStore();
             services.AddIdentityInMemory((InMemoryContext)context);
-            return services.BuildServiceProvider().GetService<RoleManager<IdentityRole>>();
+            return services.BuildServiceProvider().GetRequiredService<RoleManager<IdentityRole>>();
         }
     }
 }
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/RoleStoreTest.cs b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/RoleStoreTest.cs
index 03bc139ca5..a04ad66e2c 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/RoleStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/RoleStoreTest.cs
@@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
             var store = new RoleStore<IdentityRole>(new InMemoryContext());
             services.AddIdentity().AddRoleStore(store);
             var provider = services.BuildServiceProvider();
-            var manager = provider.GetService<RoleManager<IdentityRole>>();
+            var manager = provider.GetRequiredService<RoleManager<IdentityRole>>();
             Assert.NotNull(manager);
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(new IdentityRole("arole")));
         }
@@ -34,7 +34,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
             services.AddTransient<IRoleValidator<IdentityRole>, RoleValidator<IdentityRole>>();
             services.AddSingleton<RoleManager<IdentityRole>>();
             var provider = services.BuildServiceProvider();
-            var manager = provider.GetService<RoleManager<IdentityRole>>();
+            var manager = provider.GetRequiredService<RoleManager<IdentityRole>>();
             Assert.NotNull(manager);
             IdentityResultAssert.IsSuccess(await manager.CreateAsync(new IdentityRole("someRole")));
         }
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/TestIdentityFactory.cs b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/TestIdentityFactory.cs
index 910551dc0f..369dd36a34 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/TestIdentityFactory.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/TestIdentityFactory.cs
@@ -35,7 +35,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
         {
             var services = new ServiceCollection();
             services.AddIdentity().AddRoleStore(new RoleStore<IdentityRole>(context));
-            return services.BuildServiceProvider().GetService<RoleManager<IdentityRole>>();
+            return services.BuildServiceProvider().GetRequiredService<RoleManager<IdentityRole>>();
         }
 
         public static RoleManager<IdentityRole> CreateRoleManager()
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/DbUtil.cs b/test/Microsoft.AspNet.Identity.EntityFramework.Test/DbUtil.cs
index fccea8f43b..e0f9098c03 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/DbUtil.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/DbUtil.cs
@@ -41,7 +41,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
         public static TContext Create<TContext>(string connectionString) where TContext : DbContext, new()
         {
             var serviceProvider = ConfigureDbServices<TContext>(connectionString).BuildServiceProvider();
-            return serviceProvider.GetService<TContext>();
+            return serviceProvider.GetRequiredService<TContext>();
         }
 
     }
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/DefaultPocoTest.cs b/test/Microsoft.AspNet.Identity.EntityFramework.Test/DefaultPocoTest.cs
index 9cc9c11541..dcad05dea6 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/DefaultPocoTest.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/DefaultPocoTest.cs
@@ -54,8 +54,8 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
                 services.AddDefaultIdentity<IdentityDbContext, IdentityUser, IdentityRole>();
             });
 
-            var userStore = builder.ApplicationServices.GetService<IUserStore<IdentityUser>>();
-            var userManager = builder.ApplicationServices.GetService<UserManager<IdentityUser>>();
+            var userStore = builder.ApplicationServices.GetRequiredService<IUserStore<IdentityUser>>();
+            var userManager = builder.ApplicationServices.GetRequiredService<UserManager<IdentityUser>>();
 
             Assert.NotNull(userStore);
             Assert.NotNull(userManager);
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/SqlStoreTestBase.cs b/test/Microsoft.AspNet.Identity.EntityFramework.Test/SqlStoreTestBase.cs
index 4c9655dd48..f8013e73bc 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/SqlStoreTestBase.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/SqlStoreTestBase.cs
@@ -76,7 +76,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
                 context = CreateTestContext();
             }
             services.AddIdentity<TUser, TRole>().AddRoleStore(new RoleStore<TRole, TestDbContext, TKey>((TestDbContext)context));
-            return services.BuildServiceProvider().GetService<RoleManager<TRole>>();
+            return services.BuildServiceProvider().GetRequiredService<RoleManager<TRole>>();
         }
 
         public void EnsureDatabase()
@@ -96,8 +96,8 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
                 services.AddIdentityEntityFramework<TestDbContext, TUser, TRole, TKey>();
             });
 
-            var userStore = builder.ApplicationServices.GetService<IUserStore<TUser>>();
-            var userManager = builder.ApplicationServices.GetService<UserManager<TUser>>();
+            var userStore = builder.ApplicationServices.GetRequiredService<IUserStore<TUser>>();
+            var userManager = builder.ApplicationServices.GetRequiredService<UserManager<TUser>>();
 
             Assert.NotNull(userStore);
             Assert.NotNull(userManager);
@@ -130,8 +130,8 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
                 });
             });
 
-            var userStore = builder.ApplicationServices.GetService<IUserStore<TUser>>();
-            var userManager = builder.ApplicationServices.GetService<UserManager<TUser>>();
+            var userStore = builder.ApplicationServices.GetRequiredService<IUserStore<TUser>>();
+            var userManager = builder.ApplicationServices.GetRequiredService<UserManager<TUser>>();
 
             Assert.NotNull(userStore);
             Assert.NotNull(userManager);
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreGuidKeyTest.cs b/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreGuidKeyTest.cs
index a3469c34ec..43185a33b8 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreGuidKeyTest.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreGuidKeyTest.cs
@@ -77,7 +77,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
             }
             var services = DbUtil.ConfigureDbServices(ConnectionString);
             services.AddIdentity<GuidUser, GuidRole>().AddRoleStore(new ApplicationRoleStore((TestDbContext)context));
-            return services.BuildServiceProvider().GetService<RoleManager<GuidRole>>();
+            return services.BuildServiceProvider().GetRequiredService<RoleManager<GuidRole>>();
         }
     }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreTest.cs b/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreTest.cs
index e2f94908b2..c0d62cd66e 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreTest.cs
@@ -56,8 +56,8 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
                 services.AddDefaultIdentity<ApplicationDbContext, ApplicationUser, IdentityRole>();
             });
 
-            var userStore = builder.ApplicationServices.GetService<IUserStore<ApplicationUser>>();
-            var userManager = builder.ApplicationServices.GetService<UserManager<ApplicationUser>>();
+            var userStore = builder.ApplicationServices.GetRequiredService<IUserStore<ApplicationUser>>();
+            var userManager = builder.ApplicationServices.GetRequiredService<UserManager<ApplicationUser>>();
 
             Assert.NotNull(userStore);
             Assert.NotNull(userManager);
@@ -92,8 +92,8 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
                 });
             });
 
-            var userStore = builder.ApplicationServices.GetService<IUserStore<ApplicationUser>>();
-            var userManager = builder.ApplicationServices.GetService<UserManager<ApplicationUser>>();
+            var userStore = builder.ApplicationServices.GetRequiredService<IUserStore<ApplicationUser>>();
+            var userManager = builder.ApplicationServices.GetRequiredService<UserManager<ApplicationUser>>();
 
             Assert.NotNull(userStore);
             Assert.NotNull(userManager);
@@ -164,7 +164,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework.Test
         {
             var services = DbUtil.ConfigureDbServices(ConnectionString);
             services.AddIdentity().AddRoleStore(new RoleStore<IdentityRole>(context));
-            return services.BuildServiceProvider().GetService<RoleManager<IdentityRole>>();
+            return services.BuildServiceProvider().GetRequiredService<RoleManager<IdentityRole>>();
         }
 
         protected override RoleManager<IdentityRole> CreateRoleManager(object context)
diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/HttpSignInTest.cs b/test/Microsoft.AspNet.Identity.InMemory.Test/HttpSignInTest.cs
index deed93526d..a0066ca23d 100644
--- a/test/Microsoft.AspNet.Identity.InMemory.Test/HttpSignInTest.cs
+++ b/test/Microsoft.AspNet.Identity.InMemory.Test/HttpSignInTest.cs
@@ -45,8 +45,8 @@ namespace Microsoft.AspNet.Identity.InMemory.Test
                 UserName = "Yolo"
             };
             const string password = "Yol0Sw@g!";
-            var userManager = app.ApplicationServices.GetService<UserManager<ApplicationUser>>();
-            var signInManager = app.ApplicationServices.GetService<SignInManager<ApplicationUser>>();
+            var userManager = app.ApplicationServices.GetRequiredService<UserManager<ApplicationUser>>();
+            var signInManager = app.ApplicationServices.GetRequiredService<SignInManager<ApplicationUser>>();
 
             IdentityResultAssert.IsSuccess(await userManager.CreateAsync(user, password));
             var result = await signInManager.PasswordSignInAsync(user.UserName, password, isPersistent, false);
diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs b/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs
index 7759c4f5d5..55b8e69c7b 100644
--- a/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.InMemory.Test/InMemoryStoreTest.cs
@@ -29,14 +29,14 @@ namespace Microsoft.AspNet.Identity.InMemory.Test
                 options.Password.RequireUppercase = false;
                 options.User.UserNameValidationRegex = null;
             });
-            return services.BuildServiceProvider().GetService<UserManager<IdentityUser>>();
+            return services.BuildServiceProvider().GetRequiredService<UserManager<IdentityUser>>();
         }
 
         protected override RoleManager<IdentityRole> CreateRoleManager(object context)
         {
             var services = new ServiceCollection();
             services.AddIdentity().AddInMemory();
-            return services.BuildServiceProvider().GetService<RoleManager<IdentityRole>>();
+            return services.BuildServiceProvider().GetRequiredService<RoleManager<IdentityRole>>();
         }
     }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs b/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs
index 899117a67a..b8e2959d96 100644
--- a/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs
+++ b/test/Microsoft.AspNet.Identity.InMemory.Test/StartupTest.cs
@@ -23,10 +23,10 @@ namespace Microsoft.AspNet.Identity.InMemory.Test
 
             builder.UseServices(services => services.AddIdentity<ApplicationUser>().AddInMemory());
 
-            var userStore = builder.ApplicationServices.GetService<IUserStore<ApplicationUser>>();
-            var roleStore = builder.ApplicationServices.GetService<IRoleStore<IdentityRole>>();
-            var userManager = builder.ApplicationServices.GetService<UserManager<ApplicationUser>>();
-            var roleManager = builder.ApplicationServices.GetService<RoleManager<IdentityRole>>();
+            var userStore = builder.ApplicationServices.GetRequiredService<IUserStore<ApplicationUser>>();
+            var roleStore = builder.ApplicationServices.GetRequiredService<IRoleStore<IdentityRole>>();
+            var userManager = builder.ApplicationServices.GetRequiredService<UserManager<ApplicationUser>>();
+            var roleManager = builder.ApplicationServices.GetRequiredService<RoleManager<IdentityRole>>();
 
             Assert.NotNull(userStore);
             Assert.NotNull(userManager);
@@ -42,20 +42,20 @@ namespace Microsoft.AspNet.Identity.InMemory.Test
             var builder = new ApplicationBuilder(new ServiceCollection().BuildServiceProvider());
             builder.UseServices(services => services.AddIdentity<ApplicationUser>().AddInMemory());
 
-            var userStore = builder.ApplicationServices.GetService<IUserStore<ApplicationUser>>();
-            var roleStore = builder.ApplicationServices.GetService<IRoleStore<IdentityRole>>();
-            var userManager = builder.ApplicationServices.GetService<UserManager<ApplicationUser>>();
-            var roleManager = builder.ApplicationServices.GetService<RoleManager<IdentityRole>>();
+            var userStore = builder.ApplicationServices.GetRequiredService<IUserStore<ApplicationUser>>();
+            var roleStore = builder.ApplicationServices.GetRequiredService<IRoleStore<IdentityRole>>();
+            var userManager = builder.ApplicationServices.GetRequiredService<UserManager<ApplicationUser>>();
+            var roleManager = builder.ApplicationServices.GetRequiredService<RoleManager<IdentityRole>>();
 
             Assert.NotNull(userStore);
             Assert.NotNull(userManager);
             Assert.NotNull(roleStore);
             Assert.NotNull(roleManager);
 
-            var userStore2 = builder.ApplicationServices.GetService<IUserStore<ApplicationUser>>();
-            var roleStore2 = builder.ApplicationServices.GetService<IRoleStore<IdentityRole>>();
-            var userManager2 = builder.ApplicationServices.GetService<UserManager<ApplicationUser>>();
-            var roleManager2 = builder.ApplicationServices.GetService<RoleManager<IdentityRole>>();
+            var userStore2 = builder.ApplicationServices.GetRequiredService<IUserStore<ApplicationUser>>();
+            var roleStore2 = builder.ApplicationServices.GetRequiredService<IRoleStore<IdentityRole>>();
+            var userManager2 = builder.ApplicationServices.GetRequiredService<UserManager<ApplicationUser>>();
+            var roleManager2 = builder.ApplicationServices.GetRequiredService<RoleManager<IdentityRole>>();
 
             // Stores are singleton, managers are scoped
             Assert.Equal(userStore, userStore2);
@@ -70,8 +70,8 @@ namespace Microsoft.AspNet.Identity.InMemory.Test
             const string userName = "admin";
             const string roleName = "Admins";
             const string password = "1qaz@WSX";
-            var userManager = serviceProvider.GetService<UserManager<ApplicationUser>>();
-            var roleManager = serviceProvider.GetService<RoleManager<IdentityRole>>();
+            var userManager = serviceProvider.GetRequiredService<UserManager<ApplicationUser>>();
+            var roleManager = serviceProvider.GetRequiredService<RoleManager<IdentityRole>>();
 
             var user = new ApplicationUser { UserName = userName };
             IdentityResultAssert.IsSuccess(await userManager.CreateAsync(user, password));
diff --git a/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs b/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs
index 41820382dc..dcea443aea 100644
--- a/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs
+++ b/test/Microsoft.AspNet.Identity.Test/IdentityBuilderTest.cs
@@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Identity.Test
             var services = new ServiceCollection();
             var validator = new UserValidator<IdentityUser>();
             services.AddIdentity<IdentityUser>().AddUserValidator(validator);
-            Assert.Equal(validator, services.BuildServiceProvider().GetService<IUserValidator<IdentityUser>>());
+            Assert.Equal(validator, services.BuildServiceProvider().GetRequiredService<IUserValidator<IdentityUser>>());
         }
 
         [Fact]
@@ -25,7 +25,7 @@ namespace Microsoft.AspNet.Identity.Test
             var services = new ServiceCollection();
             var validator = new PasswordValidator<IdentityUser>();
             services.AddIdentity<IdentityUser>().AddPasswordValidator(validator);
-            Assert.Equal(validator, services.BuildServiceProvider().GetService<IPasswordValidator<IdentityUser>>());
+            Assert.Equal(validator, services.BuildServiceProvider().GetRequiredService<IPasswordValidator<IdentityUser>>());
         }
 
         [Fact]
@@ -41,13 +41,13 @@ namespace Microsoft.AspNet.Identity.Test
             services.AddIdentity<IdentityUser>();
 
             var provider = services.BuildServiceProvider();
-            var userValidator = provider.GetService<IUserValidator<IdentityUser>>() as UserValidator<IdentityUser>;
+            var userValidator = provider.GetRequiredService<IUserValidator<IdentityUser>>() as UserValidator<IdentityUser>;
             Assert.NotNull(userValidator);
 
-            var pwdValidator = provider.GetService<IPasswordValidator<IdentityUser>>() as PasswordValidator<IdentityUser>;
+            var pwdValidator = provider.GetRequiredService<IPasswordValidator<IdentityUser>>() as PasswordValidator<IdentityUser>;
             Assert.NotNull(pwdValidator);
 
-            var hasher = provider.GetService<IPasswordHasher<IdentityUser>>() as PasswordHasher<IdentityUser>;
+            var hasher = provider.GetRequiredService<IPasswordHasher<IdentityUser>>() as PasswordHasher<IdentityUser>;
             Assert.NotNull(hasher);
         }
 
@@ -55,7 +55,7 @@ namespace Microsoft.AspNet.Identity.Test
         {
             var services = new ServiceCollection();
             services.AddIdentity<IdentityUser>().AddInstance(instance);
-            Assert.Equal(instance, services.BuildServiceProvider().GetService<TService>());
+            Assert.Equal(instance, services.BuildServiceProvider().GetRequiredService<TService>());
         }
 
     }
diff --git a/test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs b/test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs
index 83f13416c2..4d7983804a 100644
--- a/test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs
+++ b/test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs
@@ -66,7 +66,7 @@ namespace Microsoft.AspNet.Identity.Test
 
             var services = new ServiceCollection {OptionsServices.GetDefaultServices()};
             services.AddIdentity(config.GetSubKey("identity"));
-            var accessor = services.BuildServiceProvider().GetService<IOptions<IdentityOptions>>();
+            var accessor = services.BuildServiceProvider().GetRequiredService<IOptions<IdentityOptions>>();
             Assert.NotNull(accessor);
             var options = accessor.Options;
             Assert.Equal(roleClaimType, options.ClaimsIdentity.RoleClaimType);
@@ -96,7 +96,7 @@ namespace Microsoft.AspNet.Identity.Test
             var services = new ServiceCollection { OptionsServices.GetDefaultServices() };
             services.AddIdentity(config.GetSubKey("identity"), 
                 o => { o.User.RequireUniqueEmail = false; o.Lockout.MaxFailedAccessAttempts++; });
-            var accessor = services.BuildServiceProvider().GetService<IOptions<IdentityOptions>>();
+            var accessor = services.BuildServiceProvider().GetRequiredService<IOptions<IdentityOptions>>();
             Assert.NotNull(accessor);
             var options = accessor.Options;
             Assert.False(options.User.RequireUniqueEmail);
@@ -120,9 +120,9 @@ namespace Microsoft.AspNet.Identity.Test
                 services.ConfigureOptions<PasswordsNegativeLengthSetup>();
             });
 
-            var setup = builder.ApplicationServices.GetService<IConfigureOptions<IdentityOptions>>();
+            var setup = builder.ApplicationServices.GetRequiredService<IConfigureOptions<IdentityOptions>>();
             Assert.IsType(typeof(PasswordsNegativeLengthSetup), setup);
-            var optionsGetter = builder.ApplicationServices.GetService<IOptions<IdentityOptions>>();
+            var optionsGetter = builder.ApplicationServices.GetRequiredService<IOptions<IdentityOptions>>();
             Assert.NotNull(optionsGetter);
             var myOptions = optionsGetter.Options;
             Assert.True(myOptions.Password.RequireLowercase);
@@ -141,7 +141,7 @@ namespace Microsoft.AspNet.Identity.Test
                 services.AddIdentity<IdentityUser>().ConfigureIdentity(options => options.User.RequireUniqueEmail = true);
             });
 
-            var optionsGetter = app.ApplicationServices.GetService<IOptions<IdentityOptions>>();
+            var optionsGetter = app.ApplicationServices.GetRequiredService<IOptions<IdentityOptions>>();
             Assert.NotNull(optionsGetter);
 
             var myOptions = optionsGetter.Options;
diff --git a/test/Microsoft.AspNet.Identity.Test/SignInManagerTest.cs b/test/Microsoft.AspNet.Identity.Test/SignInManagerTest.cs
index b1d56f25d7..96d6c3e14b 100644
--- a/test/Microsoft.AspNet.Identity.Test/SignInManagerTest.cs
+++ b/test/Microsoft.AspNet.Identity.Test/SignInManagerTest.cs
@@ -53,8 +53,8 @@ namespace Microsoft.AspNet.Identity.Test
         //        UserName = "Yolo"
         //    };
         //    const string password = "Yol0Sw@g!";
-        //    var userManager = app.ApplicationServices.GetService<ApplicationUserManager>();
-        //    var HttpSignInManager = app.ApplicationServices.GetService<ApplicationHttpSignInManager>();
+        //    var userManager = app.ApplicationServices.GetRequiredService<ApplicationUserManager>();
+        //    var HttpSignInManager = app.ApplicationServices.GetRequiredService<ApplicationHttpSignInManager>();
 
         //    IdentityResultAssert.IsSuccess(await userManager.CreateAsync(user, password));
         //    var result = await HttpSignInManager.PasswordSignInAsync(user.UserName, password, isPersistent, false);
diff --git a/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs b/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs
index 342229a2ec..7bf2214d3f 100644
--- a/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs
+++ b/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs
@@ -34,7 +34,7 @@ namespace Microsoft.AspNet.Identity.Test
             services.Add(OptionsServices.GetDefaultServices());
             services.AddTransient<IUserStore<TestUser>, NoopUserStore>();
             services.AddTransient<TestManager>();
-            var manager = services.BuildServiceProvider().GetService<TestManager>();
+            var manager = services.BuildServiceProvider().GetRequiredService<TestManager>();
             Assert.NotNull(manager.PasswordHasher);
             Assert.NotNull(manager.PasswordValidator);
             Assert.NotNull(manager.UserValidator);