diff --git a/GitVersion.yml b/GitVersion.yml
index 0cd51a4ad..f2a251c55 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -2,5 +2,6 @@ continuous-delivery-fallback-tag: ci
 branches:
     master:
         tag: unstable
+        mode: ContinuousDeployment
     pull-request:
         tag: pr
diff --git a/ci-test.ps1 b/ci-test.ps1
index fc368b22f..35a9b4646 100644
--- a/ci-test.ps1
+++ b/ci-test.ps1
@@ -34,8 +34,4 @@ elseif ($platform -eq '-x86' -and $targetFramework -match $netFxRegex) {
 else {
 
   dotnet test --no-build -c Release -f $targetFramework
-}
-
-# Explicitly exit with 0 to ignore errors caused by coverlet attempting to read
-# project files that dotnet test is set to ignore.
-exit 0
+}
\ No newline at end of file
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index c0e01ae58..68d4f8949 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -50,6 +50,6 @@
 
   <!-- Empty target so that `dotnet test` will work on the solution -->
   <!-- https://github.com/Microsoft/vstest/issues/411 -->
-  <Target Name="VSTest" />
+  <Target Name="VSTest" Condition="'$(IsTestProject)' == 'true'"/>
 
 </Project>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index 22c634d9b..3d8286971 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -28,6 +28,9 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" IsImplicitlyDefined="true" />
     <PackageReference Include="xunit" IsImplicitlyDefined="true" />
     <PackageReference Include="xunit.runner.visualstudio" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(codecov)' == 'true' AND '$(IsTestProject)' == 'true'">
     <PackageReference Include="coverlet.collector" IsImplicitlyDefined="true" />
     <PackageReference Include="coverlet.msbuild" IsImplicitlyDefined="true" />
   </ItemGroup>
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
index 26baee07e..9ee9c226d 100644
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@@ -25,7 +25,7 @@
 
   <!--Code coverage specific settings-->
   <!--https://github.com/tonerdo/coverlet-->
-  <PropertyGroup Condition="'$(codecov)' == 'true'">
+  <PropertyGroup Condition="'$(codecov)' == 'true' AND '$(IsTestProject)' == 'true'">
     <CollectCoverage>true</CollectCoverage>
     <UseSourceLink>true</UseSourceLink>
     <CoverletOutputFormat>opencover</CoverletOutputFormat>
diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
index 41e6749be..4aabc2f4e 100644
--- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
+++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@@ -8,6 +8,8 @@
     <AssemblyName>SixLabors.ImageSharp.Tests</AssemblyName>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <RootNamespace>SixLabors.ImageSharp.Tests</RootNamespace>
+    <!--Used to show test project to dotnet test-->
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>