diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 65099c75e..e9c1e5642 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -23,6 +23,10 @@
     <ReadarrProject Condition="$(MSBuildProjectName.StartsWith('Readarr'))">true</ReadarrProject>
     <ReadarrProject Condition="$(MSBuildProjectName.StartsWith('ServiceInstall'))">true</ReadarrProject>
     <ReadarrProject Condition="$(MSBuildProjectName.StartsWith('ServiceUninstall'))">true</ReadarrProject>
+
+    <!-- A test project gets the test sdk packages automatically added -->
+    <TestProject>false</TestProject>
+    <TestProject Condition="$(MSBuildProjectName.EndsWith('.Test'))">true</TestProject>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -82,6 +86,15 @@
     <RootNamespace Condition="'$(ReadarrProject)'=='true'">$(MSBuildProjectName.Replace('Readarr','NzbDrone'))</RootNamespace>
   </PropertyGroup>
 
+  <!-- Standard testing packages -->
+  <ItemGroup Condition="'$(TestProject)'=='true'">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="NunitXml.TestLogger" Version="2.1.62" />
+    <PackageReference Include="coverlet.collector" Version="1.2.1" PrivateAssets="all" />
+  </ItemGroup>
+
   <!-- Set up stylecop -->
   <ItemGroup Condition="'$(ReadarrProject)'=='true' and '$(EnableAnalyzers)'!='false'">
     <!-- StyleCop analysis -->
diff --git a/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj b/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj
index cbb9f3e18..492e03164 100644
--- a/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj
+++ b/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj
@@ -3,18 +3,8 @@
     <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="NunitXml.TestLogger" Version="2.1.62" />
     <PackageReference Include="NBuilder" Version="6.1.0" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="coverlet.collector" Version="1.3.0" PrivateAssets="all" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Core\Readarr.Core.csproj" />
     <ProjectReference Include="..\NzbDrone.Test.Common\Readarr.Test.Common.csproj" />
diff --git a/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj b/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj
index 0b96a5671..364e9c71e 100644
--- a/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj
+++ b/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj
@@ -3,13 +3,6 @@
     <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="NunitXml.TestLogger" Version="2.1.62" />
     <PackageReference Include="Selenium.Support" Version="3.141.0" />
     <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="88.0.4324.9600" />
   </ItemGroup>
diff --git a/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj b/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj
index f888fde4f..760e7e10d 100644
--- a/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj
+++ b/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj
@@ -2,16 +2,6 @@
   <PropertyGroup>
     <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="NunitXml.TestLogger" Version="2.1.62" />
-    <PackageReference Include="coverlet.collector" Version="1.3.0" PrivateAssets="all" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Host\Readarr.Host.csproj" />
     <ProjectReference Include="..\NzbDrone.Test.Common\Readarr.Test.Common.csproj" />
diff --git a/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj
index 0a8fe30e3..30084d035 100644
--- a/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj
@@ -3,21 +3,11 @@
     <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="NunitXml.TestLogger" Version="2.1.62" />
     <PackageReference Include="System.Buffers" Version="4.5.1" />
     <PackageReference Include="NBuilder" Version="6.1.0" />
     <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="12.0.4" />
     <PackageReference Include="AutoFixture" Version="4.12.0" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="coverlet.collector" Version="1.3.0" PrivateAssets="all" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Test.Common\Readarr.Test.Common.csproj" />
     <ProjectReference Include="..\NzbDrone.Core\Readarr.Core.csproj" />
diff --git a/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj b/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj
index b420dc2fd..7938d6254 100644
--- a/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj
+++ b/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj
@@ -2,16 +2,6 @@
   <PropertyGroup>
     <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="NunitXml.TestLogger" Version="2.1.62" />
-    <PackageReference Include="coverlet.collector" Version="1.3.0" PrivateAssets="all" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Host\Readarr.Host.csproj" />
     <ProjectReference Include="..\NzbDrone.Test.Common\Readarr.Test.Common.csproj" />
diff --git a/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj
index cd6b655a0..560a96f66 100644
--- a/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj
+++ b/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj
@@ -4,13 +4,6 @@
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="NunitXml.TestLogger" Version="2.1.62" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.3" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj
index 8e65e062e..cd8f7fd55 100644
--- a/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj
+++ b/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj
@@ -2,18 +2,6 @@
   <PropertyGroup>
     <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="NunitXml.TestLogger" Version="2.1.62" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="coverlet.collector" Version="1.3.0" PrivateAssets="all" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Test.Common\Readarr.Test.Common.csproj" />
   </ItemGroup>
diff --git a/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj
index 604fb5c68..552b9f298 100644
--- a/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj
+++ b/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj
@@ -3,15 +3,7 @@
     <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="NunitXml.TestLogger" Version="2.1.62" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1-servarr1" />
-    <PackageReference Include="coverlet.collector" Version="1.3.0" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Common.Test\Readarr.Common.Test.csproj" />
diff --git a/src/NzbDrone.Test.Common/Readarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Readarr.Test.Common.csproj
index f362cf7a8..a2c10343a 100644
--- a/src/NzbDrone.Test.Common/Readarr.Test.Common.csproj
+++ b/src/NzbDrone.Test.Common/Readarr.Test.Common.csproj
@@ -8,7 +8,7 @@
     <PackageReference Include="Moq" Version="4.14.5" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NLog" Version="4.7.2" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="RestSharp" Version="106.11.7" />
     <PackageReference Include="RestSharp.Serializers.SystemTextJson" Version="106.11.7" />
     <PackageReference Include="System.IO.Abstractions" Version="12.0.4" />
diff --git a/src/NzbDrone.Update.Test/Readarr.Update.Test.csproj b/src/NzbDrone.Update.Test/Readarr.Update.Test.csproj
index c9bca7a22..b56a7e829 100644
--- a/src/NzbDrone.Update.Test/Readarr.Update.Test.csproj
+++ b/src/NzbDrone.Update.Test/Readarr.Update.Test.csproj
@@ -2,18 +2,6 @@
   <PropertyGroup>
     <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="NunitXml.TestLogger" Version="2.1.62" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="coverlet.collector" Version="1.3.0" PrivateAssets="all" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Test.Common\Readarr.Test.Common.csproj" />
     <ProjectReference Include="..\NzbDrone.Update\Readarr.Update.csproj" />
diff --git a/src/NzbDrone.Windows.Test/Readarr.Windows.Test.csproj b/src/NzbDrone.Windows.Test/Readarr.Windows.Test.csproj
index 644c1c54c..aab1ace92 100644
--- a/src/NzbDrone.Windows.Test/Readarr.Windows.Test.csproj
+++ b/src/NzbDrone.Windows.Test/Readarr.Windows.Test.csproj
@@ -2,18 +2,6 @@
   <PropertyGroup>
     <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="NunitXml.TestLogger" Version="2.1.62" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="coverlet.collector" Version="1.3.0" PrivateAssets="all" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Common.Test\Readarr.Common.Test.csproj" />
     <ProjectReference Include="..\NzbDrone.Test.Common\Readarr.Test.Common.csproj" />