diff --git a/test/Microsoft.AspNet.Identity.SqlServer.Test/SqlStoreTestBase.cs b/test/Microsoft.AspNet.Identity.SqlServer.Test/SqlStoreTestBase.cs
index 32ae6dfd40..e6c89a0677 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.Test/SqlStoreTestBase.cs
+++ b/test/Microsoft.AspNet.Identity.SqlServer.Test/SqlStoreTestBase.cs
@@ -28,16 +28,21 @@ namespace Microsoft.AspNet.Identity.SqlServer.Test
             public ApplicationDbContext(IServiceProvider services, IOptionsAccessor<DbContextOptions> options) : base(services, options.Options) { }
         }
 
-        [TestPriority(-1)]
+        [TestPriority(-1000)]
         [Fact]
-        public void RecreateDatabase()
+        public void DropDatabaseStart()
         {
-            CreateContext(true);
+            DropDb();
         }
 
         [TestPriority(10000)]
         [Fact]
-        public void DropDatabase()
+        public void DropDatabaseDone()
+        {
+            DropDb();
+        }
+
+        public void DropDb()
         {
             var services = new ServiceCollection();
             services.AddEntityFramework().AddSqlServer();
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreTest.cs b/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreTest.cs
index 25cbe1fbf6..f7c53e60b7 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreTest.cs
@@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Identity.SqlServer.Test
     [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.SqlServer.Test")]
     public class UserStoreTest : UserManagerTestBase<IdentityUser, IdentityRole>
     {
-        private const string ConnectionString = @"Server=(localdb)\v11.0;Database=SqlUserStoreTest;Trusted_Connection=True;";
+        private static readonly string ConnectionString = @"Server=(localdb)\v11.0;Database=SqlUserStoreTest;Trusted_Connection=True;";
 
         public class ApplicationUser : IdentityUser { }
 
@@ -30,16 +30,21 @@ namespace Microsoft.AspNet.Identity.SqlServer.Test
             public ApplicationDbContext(IServiceProvider services, IOptionsAccessor<DbContextOptions> options) : base(services, options.Options) { }
         }
 
-        [TestPriority(-1)]
+        [TestPriority(-1000)]
         [Fact]
-        public void RecreateDatabase()
+        public void DropDatabaseStart()
         {
-            CreateContext(true);
+            DropDb();
         }
 
         [TestPriority(10000)]
         [Fact]
-        public void DropDatabase()
+        public void DropDatabaseDone()
+        {
+            DropDb();
+        }
+
+        public void DropDb()
         {
             var services = new ServiceCollection();
             services.AddEntityFramework().AddSqlServer();
@@ -126,7 +131,7 @@ namespace Microsoft.AspNet.Identity.SqlServer.Test
             }
         }
 
-        public static IdentityDbContext CreateContext(bool delete = false)
+        public IdentityDbContext CreateContext(bool delete = false)
         {
             var services = new ServiceCollection();
             services.AddEntityFramework().AddSqlServer();
@@ -146,12 +151,12 @@ namespace Microsoft.AspNet.Identity.SqlServer.Test
             return CreateContext();
         }
 
-        public static void EnsureDatabase()
+        public void EnsureDatabase()
         {
             CreateContext();
         }
 
-        public static ApplicationDbContext CreateAppContext()
+        public ApplicationDbContext CreateAppContext()
         {
             CreateContext();
             var services = new ServiceCollection();