diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
index 04aa5dc7e2..6e8ba8881d 100644
--- a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
@@ -79,7 +79,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
                             {
                                 var databaseExists = dbContext.Database.AsRelational().Exists();
 
-                                var migrator = ((IAccessor<Migrator>)dbContext.Database).Service;
+                                var migrator = ((IAccessor<IMigrator>)dbContext.Database).Service;
 
                                 var pendingMigrations = migrator.GetUnappliedMigrations().Select(m => m.Id);
 
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
index 07531a2e9c..3d78808792 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
@@ -161,7 +161,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
             {
                 using (var db = context.ApplicationServices.GetService<BloggingContextWithPendingModelChanges>())
                 {
-                    var migrator = ((IAccessor<Migrator>)db.Database).Service;
+                    var migrator = ((IAccessor<IMigrator>)db.Database).Service;
                     migrator.ApplyMigrations();
 
                     db.Blogs.Add(new Blog());