diff --git a/src/NzbDrone.Api.Test/Sonarr.Api.Test.csproj b/src/NzbDrone.Api.Test/Sonarr.Api.Test.csproj
index d3cd67585..12a3c40f5 100644
--- a/src/NzbDrone.Api.Test/Sonarr.Api.Test.csproj
+++ b/src/NzbDrone.Api.Test/Sonarr.Api.Test.csproj
@@ -4,7 +4,7 @@
     <Platforms>x86</Platforms>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NBuilder" Version="4.0.0" />
+    <PackageReference Include="NBuilder" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Core\Sonarr.Core.csproj" />
diff --git a/src/NzbDrone.Common.Test/Http/HttpHeaderFixture.cs b/src/NzbDrone.Common.Test/Http/HttpHeaderFixture.cs
index 8abdcf6e8..e0a22072e 100644
--- a/src/NzbDrone.Common.Test/Http/HttpHeaderFixture.cs
+++ b/src/NzbDrone.Common.Test/Http/HttpHeaderFixture.cs
@@ -35,7 +35,7 @@ namespace NzbDrone.Common.Test.Http
             var httpheader = new HttpHeader(headers);
 
             Action action = () => httpheader.GetEncodingFromContentType();
-            action.ShouldThrow<ArgumentException>();
+            action.Should().Throw<ArgumentException>();
         }
 
         [Test]
diff --git a/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs b/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs
index 1a1a900c6..e4775e037 100644
--- a/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs
@@ -64,7 +64,7 @@ namespace NzbDrone.Core.Test.Datastore
             Subject.Insert(_basicType);
             var storeObject = Subject.Get(_basicType.Id);
 
-            storeObject.ShouldBeEquivalentTo(_basicType, o=>o.IncludingAllRuntimeProperties());
+            storeObject.Should().BeEquivalentTo(_basicType, o=>o.IncludingAllRuntimeProperties());
         }
 
         [Test]
diff --git a/src/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs b/src/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs
index b736fb7a6..cb9d7ea86 100644
--- a/src/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs
@@ -32,7 +32,7 @@ namespace NzbDrone.Core.Test.Datastore
             var loadedEpisodeFile = Db.Single<Episode>().EpisodeFile.Value;
 
             loadedEpisodeFile.Should().NotBeNull();
-            loadedEpisodeFile.ShouldBeEquivalentTo(episodeFile,
+            loadedEpisodeFile.Should().BeEquivalentTo(episodeFile,
                 options => options
                     .IncludingAllRuntimeProperties()
                     .Excluding(c => c.DateAdded)
diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/122_add_remux_qualities_in_profileFixture.cs b/src/NzbDrone.Core.Test/Datastore/Migration/122_add_remux_qualities_in_profileFixture.cs
index 00ef9fb8c..afa35e630 100644
--- a/src/NzbDrone.Core.Test/Datastore/Migration/122_add_remux_qualities_in_profileFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/Migration/122_add_remux_qualities_in_profileFixture.cs
@@ -29,7 +29,7 @@ namespace NzbDrone.Core.Test.Datastore.Migration
             items.Should().HaveCount(4);
             items.Select(v => v.Quality).Should().BeEquivalentTo(7, 20, 19, 21);
             items.Select(v => v.Allowed).Should().BeEquivalentTo(true, false, true, false);
-            items.Select(v => v.Name).Should().BeEquivalentTo(null, null, null, null);
+            items.Select(v => v.Name).Should().BeEquivalentTo(null, null, null, (string)null);
         }
 
         [Test]
diff --git a/src/NzbDrone.Core.Test/IndexerTests/SeasonSearchFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/SeasonSearchFixture.cs
index 075bb73e2..3092546e0 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/SeasonSearchFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/SeasonSearchFixture.cs
@@ -39,7 +39,7 @@ namespace NzbDrone.Core.Test.IndexerTests
             
             var requests = Builder<IndexerRequest>.CreateListOfSize(paging ? 100 : 1)
                 .All()
-                .WithConstructor(() => new IndexerRequest("http://my.feed.local/", HttpAccept.Rss))
+                .WithFactory(() => new IndexerRequest("http://my.feed.local/", HttpAccept.Rss))
                 .With(v => v.HttpRequest.Method = HttpMethod.GET)
                 .Build();
 
diff --git a/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssParserFactoryFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssParserFactoryFixture.cs
index 2e8e9aace..0ed86b3c1 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssParserFactoryFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssParserFactoryFixture.cs
@@ -118,7 +118,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 
             var detection2 = Subject.GetParser(_indexerSettings1);
 
-            detection1.ShouldBeEquivalentTo(detection2);
+            detection1.Should().BeEquivalentTo(detection2);
 
             VerifyDetectionCount(1);
         }
diff --git a/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssSettingsDetectorFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssSettingsDetectorFixture.cs
index 9a3aac3ef..2f34f1d00 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssSettingsDetectorFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssSettingsDetectorFixture.cs
@@ -37,7 +37,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 
             var settings = Subject.Detect(_indexerSettings);
 
-            settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings
+            settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings
                 {
                     UseEZTVFormat = true,
                     UseEnclosureUrl = false,
@@ -55,7 +55,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 
             var settings = Subject.Detect(_indexerSettings);
 
-            settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings
+            settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings
             {
                 UseEZTVFormat = false,
                 UseEnclosureUrl = false,
@@ -73,7 +73,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 
             var settings = Subject.Detect(_indexerSettings);
 
-            settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings
+            settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings
             {
                 UseEZTVFormat = false,
                 UseEnclosureUrl = false,
@@ -93,7 +93,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 
             var settings = Subject.Detect(_indexerSettings);
 
-            settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings
+            settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings
             {
                 UseEZTVFormat = false,
                 UseEnclosureUrl = true,
@@ -111,7 +111,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 
             var settings = Subject.Detect(_indexerSettings);
 
-            settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings
+            settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings
             {
                 UseEZTVFormat = false,
                 UseEnclosureUrl = true,
@@ -129,7 +129,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 
             var settings = Subject.Detect(_indexerSettings);
 
-            settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings
+            settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings
             {
                 UseEZTVFormat = false,
                 UseEnclosureUrl = false,
@@ -149,7 +149,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 
             var settings = Subject.Detect(_indexerSettings);
 
-            settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings
+            settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings
             {
                 UseEZTVFormat = false,
                 UseEnclosureUrl = true,
@@ -169,7 +169,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 
             var settings = Subject.Detect(_indexerSettings);
 
-            settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings
+            settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings
             {
                 UseEZTVFormat = false,
                 UseEnclosureUrl = true,
@@ -189,7 +189,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 
             var settings = Subject.Detect(_indexerSettings);
 
-            settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings
+            settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings
             {
                 UseEZTVFormat = false,
                 UseEnclosureUrl = true,
@@ -209,7 +209,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 
             var settings = Subject.Detect(_indexerSettings);
 
-            settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings
+            settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings
             {
                 UseEZTVFormat = false,
                 UseEnclosureUrl = false,
@@ -242,7 +242,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 
             var settings = Subject.Detect(_indexerSettings);
 
-            settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings
+            settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings
             {
                 UseEZTVFormat = false,
                 UseEnclosureUrl = true,
diff --git a/src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj
index cc9302a0d..96ee152ea 100644
--- a/src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/Sonarr.Core.Test.csproj
@@ -4,7 +4,7 @@
     <Platforms>x86</Platforms>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NBuilder" Version="4.0.0" />
+    <PackageReference Include="NBuilder" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Test.Common\Sonarr.Test.Common.csproj" />
diff --git a/src/NzbDrone.Core.Test/ThingiProviderTests/ProviderBaseFixture.cs b/src/NzbDrone.Core.Test/ThingiProviderTests/ProviderBaseFixture.cs
index a3a5a0c51..7de6c61b8 100644
--- a/src/NzbDrone.Core.Test/ThingiProviderTests/ProviderBaseFixture.cs
+++ b/src/NzbDrone.Core.Test/ThingiProviderTests/ProviderBaseFixture.cs
@@ -23,7 +23,7 @@ namespace NzbDrone.Core.Test.ThingiProviderTests
 
             var storedSetting = (NewznabSettings)storedProvider.Settings;
 
-            storedSetting.ShouldBeEquivalentTo(newznabSettings, o=>o.IncludingAllRuntimeProperties());
+            storedSetting.Should().BeEquivalentTo(newznabSettings, o=>o.IncludingAllRuntimeProperties());
         }
     }
 }
diff --git a/src/NzbDrone.Libraries.Test/JsonTests/JsonFixture.cs b/src/NzbDrone.Libraries.Test/JsonTests/JsonFixture.cs
index 064028e9d..dff1af9f1 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 = int.MaxValue, Int64 = long.MaxValue, nullableWithValue = 12 };
             var result = Json.Deserialize<TypeWithNumbers>(quality.ToJson());
 
-            result.ShouldBeEquivalentTo(quality, o => o.IncludingAllRuntimeProperties());
+            result.Should().BeEquivalentTo(quality, o => o.IncludingAllRuntimeProperties());
         }
 
         [Test]
diff --git a/src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj
index 42382464c..f60082606 100644
--- a/src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj
+++ b/src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj
@@ -4,12 +4,11 @@
     <Platforms>x86</Platforms>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CommonServiceLocator" Version="1.3" />
-    <PackageReference Include="FluentAssertions" Version="4.19.0" />
+    <PackageReference Include="FluentAssertions" Version="5.8.0" />
     <PackageReference Include="FluentValidation" Version="8.4.0" />
-    <PackageReference Include="Moq" Version="4.0.10827" />
+    <PackageReference Include="Moq" Version="4.12.0" />
     <PackageReference Include="NLog" Version="4.6.6" />
-    <PackageReference Include="NUnit" Version="3.6.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="RestSharp" Version="106.6.10" />
     <PackageReference Include="Unity" Version="2.1.505.2" />
   </ItemGroup>