diff --git a/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs b/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs
index d909baecf..1a1a900c6 100644
--- a/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs
@@ -62,9 +62,9 @@ namespace NzbDrone.Core.Test.Datastore
         public void should_be_able_to_find_by_id()
         {
             Subject.Insert(_basicType);
-            Subject.Get(_basicType.Id)
-                .Should()
-                .ShouldBeEquivalentTo(_basicType);
+            var storeObject = Subject.Get(_basicType.Id);
+
+            storeObject.ShouldBeEquivalentTo(_basicType, o=>o.IncludingAllRuntimeProperties());
         }
 
         [Test]
diff --git a/src/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs b/src/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs
index fca99e845..54f44a6e8 100644
--- a/src/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs
@@ -90,7 +90,7 @@ namespace NzbDrone.Core.Test.Datastore
 
             loadedEpisodeFile.Should().NotBeNull();
             loadedEpisodeFile.ShouldBeEquivalentTo(episodeFile,
-                options => options.Excluding(c => c.DateAdded).Excluding(c => c.Path));
+                options => options.Excluding(c => c.DateAdded).Excluding(c => c.Path).IncludingAllRuntimeProperties());
         }
 
         [Test]
diff --git a/src/NzbDrone.Core.Test/ThingiProvider/ProviderBaseFixture.cs b/src/NzbDrone.Core.Test/ThingiProvider/ProviderBaseFixture.cs
index 8ee5aa3a8..db1e21c61 100644
--- a/src/NzbDrone.Core.Test/ThingiProvider/ProviderBaseFixture.cs
+++ b/src/NzbDrone.Core.Test/ThingiProvider/ProviderBaseFixture.cs
@@ -24,7 +24,7 @@ namespace NzbDrone.Core.Test.ThingiProvider
 
             var storedSetting = (NewznabSettings)storedProvider.Settings;
 
-            storedSetting.ShouldBeEquivalentTo(newznabSettings);
+            storedSetting.ShouldBeEquivalentTo(newznabSettings, o=>o.IncludingAllRuntimeProperties());
         }
     }
 }
\ No newline at end of file
diff --git a/src/NzbDrone.Libraries.Test/JsonTests/JsonFixture.cs b/src/NzbDrone.Libraries.Test/JsonTests/JsonFixture.cs
index 7ba31a26d..6b9fe814b 100644
--- a/src/NzbDrone.Libraries.Test/JsonTests/JsonFixture.cs
+++ b/src/NzbDrone.Libraries.Test/JsonTests/JsonFixture.cs
@@ -23,7 +23,7 @@ namespace NzbDrone.Libraries.Test.JsonTests
             var quality = new TypeWithNumbers { Int32 = Int32.MaxValue, Int64 = Int64.MaxValue, nullableWithValue = 12 };
             var result = Json.Deserialize<TypeWithNumbers>(quality.ToJson());
 
-            result.ShouldBeEquivalentTo(quality);
+            result.ShouldBeEquivalentTo(quality, o => o.IncludingAllRuntimeProperties());
         }
     }
 }