diff --git a/src/NzbDrone.Core.Test/Framework/DbTest.cs b/src/NzbDrone.Core.Test/Framework/DbTest.cs
index 342bc6bcc..7ae33e059 100644
--- a/src/NzbDrone.Core.Test/Framework/DbTest.cs
+++ b/src/NzbDrone.Core.Test/Framework/DbTest.cs
@@ -99,7 +99,6 @@ namespace NzbDrone.Core.Test.Framework
         {
             WithTempAsAppPath();
 
-            Mocker.SetConstant<IAnnouncer>(Mocker.Resolve<MigrationLogger>());
             Mocker.SetConstant<IConnectionStringFactory>(Mocker.Resolve<ConnectionStringFactory>());
             Mocker.SetConstant<IMigrationController>(Mocker.Resolve<MigrationController>());
 
diff --git a/src/NzbDrone.Core.Test/Framework/MigrationTest.cs b/src/NzbDrone.Core.Test/Framework/MigrationTest.cs
index 1cdc43445..4e538546e 100644
--- a/src/NzbDrone.Core.Test/Framework/MigrationTest.cs
+++ b/src/NzbDrone.Core.Test/Framework/MigrationTest.cs
@@ -1,8 +1,8 @@
 using System;
 using FluentMigrator;
+using FluentMigrator.Runner;
 using NUnit.Framework;
 using NzbDrone.Core.Datastore.Migration.Framework;
-using NzbDrone.Test.Common.AutoMoq;
 
 namespace NzbDrone.Core.Test.Framework
 {
@@ -26,7 +26,7 @@ namespace NzbDrone.Core.Test.Framework
                 BeforeMigration = m =>
                 {
                     var migration = m as TMigration;
-                    if (beforeMigration != null && migration is TMigration)
+                    if (beforeMigration != null && migration != null)
                     {
                         beforeMigration(migration);
                     }
@@ -39,10 +39,8 @@ namespace NzbDrone.Core.Test.Framework
         [SetUp]
         public override void SetupDb()
         {
+            Mocker.SetConstant<IAnnouncer>(Mocker.Resolve<MigrationLogger>());
             SetupContainer();
         }
-
-        [Obsolete("Don't use Mocker/Repositories in MigrationTests, query the DB.", true)]
-        public new AutoMoqer Mocker => base.Mocker;
     }
 }
\ No newline at end of file
diff --git a/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneMigrationBase.cs b/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneMigrationBase.cs
index 97bfa0d77..7ebac899c 100644
--- a/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneMigrationBase.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/Framework/NzbDroneMigrationBase.cs
@@ -46,7 +46,6 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
 
         public override void Up()
         {
-
             if (Context.BeforeMigration != null)
             {
                 Context.BeforeMigration(this);