diff --git a/src/Microsoft.AspNet.Identity.EntityFramework/IdentityDbContext.cs b/src/Microsoft.AspNet.Identity.EntityFramework/IdentityDbContext.cs
index adc9b315ba..0efe8a0af8 100644
--- a/src/Microsoft.AspNet.Identity.EntityFramework/IdentityDbContext.cs
+++ b/src/Microsoft.AspNet.Identity.EntityFramework/IdentityDbContext.cs
@@ -75,13 +75,17 @@ namespace Microsoft.AspNet.Identity.EntityFramework
                     b.ToTable("AspNetRoles");
                 });
 
-            builder.Entity<IdentityUserClaim<TKey>>()
-                .Key(uc => uc.Id)
-                .ToTable("AspNetUserClaims");
+            builder.Entity<IdentityUserClaim<TKey>>(b =>
+                {
+                    b.Key(uc => uc.Id);
+                    b.ToTable("AspNetUserClaims");
+                });
 
-            builder.Entity<IdentityRoleClaim<TKey>>()
-                .Key(uc => uc.Id)
-                .ToTable("AspNetRoleClaims");
+            builder.Entity<IdentityRoleClaim<TKey>>(b =>
+                {
+                    b.Key(uc => uc.Id);
+                    b.ToTable("AspNetRoleClaims");
+                });
 
             var userType = builder.Model.GetEntityType(typeof(TUser));
             var roleType = builder.Model.GetEntityType(typeof(TRole));
@@ -100,17 +104,21 @@ namespace Microsoft.AspNet.Identity.EntityFramework
             var rcfk = roleClaimType.AddForeignKey(roleType.GetKey(), new[] { roleClaimType.GetProperty("RoleId") });
             roleType.AddNavigation(new Navigation(rcfk, "Claims", false));
 
-            builder.Entity<IdentityUserRole<TKey>>()
-                .Key(r => new { r.UserId, r.RoleId })
+            builder.Entity<IdentityUserRole<TKey>>(b =>
+                {
+                    b.Key(r => new { r.UserId, r.RoleId });
+                    b.ToTable("AspNetUserRoles");
+                });
                 // Blocks delete currently without cascade
                 //.ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId))
                 //.ForeignKeys(fk => fk.ForeignKey<TRole>(f => f.RoleId));
-                .ToTable("AspNetUserRoles");
 
-            builder.Entity<IdentityUserLogin<TKey>>()
-                .Key(l => new { l.LoginProvider, l.ProviderKey, l.UserId })
+            builder.Entity<IdentityUserLogin<TKey>>(b =>
+                {
+                    b.Key(l => new { l.LoginProvider, l.ProviderKey, l.UserId });
+                    b.ToTable("AspNetUserLogins");
+                });
                 //.ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId))
-                .ToTable("AspNetUserLogins");
         }
     }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryContext.cs b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryContext.cs
index f4f7199df4..b8a42f813d 100644
--- a/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryContext.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryContext.cs
@@ -54,31 +54,40 @@ namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
                 b.ToTable("AspNetUsers");
             });
 
-            builder.Entity<TRole>()
-                .Key(r => r.Id)
-                .ToTable("AspNetRoles");
+            builder.Entity<TRole>(b =>
+            {
+                b.Key(r => r.Id);
+                b.ToTable("AspNetRoles");
+            });
 
-            builder.Entity<TUserRole>()
-                .Key(r => new { r.UserId, r.RoleId })
-                .ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId))
-                .ForeignKeys(fk => fk.ForeignKey<TRole>(f => f.RoleId))
-                .ToTable("AspNetUserRoles");
+            builder.Entity<TUserRole>(b =>
+            {
+                b.Key(r => new { r.UserId, r.RoleId });
+                b.ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId));
+                b.ForeignKeys(fk => fk.ForeignKey<TRole>(f => f.RoleId));
+                b.ToTable("AspNetUserRoles");
+            });
 
-            builder.Entity<TUserLogin>()
-                .Key(l => new { l.LoginProvider, l.ProviderKey, l.UserId })
-                .ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId))
-                .ToTable("AspNetUserLogins");
+            builder.Entity<TUserLogin>(b =>
+            {
+                b.Key(l => new { l.LoginProvider, l.ProviderKey, l.UserId });
+                b.ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId));
+                b.ToTable("AspNetUserLogins");
+            });
 
-            builder.Entity<TUserClaim>()
-                .Key(c => c.Id)
-                .ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId))
-                .ToTable("AspNetUserClaims");
-
-            builder.Entity<IdentityRoleClaim<TKey>>()
-                .Key(c => c.Id)
-                .ForeignKeys(fk => fk.ForeignKey<TRole>(f => f.RoleId))
-                .ToTable("AspNetRoleClaims");
+            builder.Entity<TUserClaim>(b =>
+            {
+                b.Key(c => c.Id);
+                b.ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId));
+                b.ToTable("AspNetUserClaims");
+            });
 
+            builder.Entity<IdentityRoleClaim<TKey>>(b =>
+            {
+                b.Key(c => c.Id);
+                b.ForeignKeys(fk => fk.ForeignKey<TRole>(f => f.RoleId));
+                b.ToTable("AspNetRoleClaims");
+            });
         }
     }
 }
\ No newline at end of file