diff --git a/build.ps1 b/build.ps1
index 2f4d1c949..92ccb012c 100644
--- a/build.ps1
+++ b/build.ps1
@@ -101,8 +101,12 @@ dotnet build -c Release /p:packageversion=$version
 if ($LASTEXITCODE ){ Exit $LASTEXITCODE }
 
 if ( $env:CI -ne "True") {
-    dotnet test ./tests/ImageSharp.Tests/ImageSharp.Tests.csproj --no-build -c Release
+    cd ./tests/ImageSharp.Tests/
+    dotnet xunit -nobuild -c Release -f netcoreapp2.0 --fx-version 2.0.0
+    ./RunExtendedTests.cmd
+    cd ../..
 }
+
 if ($LASTEXITCODE ){ Exit $LASTEXITCODE }
 
 Write-Host "Packaging projects"
diff --git a/tests/CodeCoverage/CodeCoverage.cmd b/tests/CodeCoverage/CodeCoverage.cmd
index 622001fcf..f0ed3da1b 100644
--- a/tests/CodeCoverage/CodeCoverage.cmd
+++ b/tests/CodeCoverage/CodeCoverage.cmd
@@ -12,7 +12,7 @@ dotnet restore ImageSharp.sln
 rem Clean the solution to force a rebuild with /p:codecov=true
 dotnet clean ImageSharp.sln -c Release
 rem The -threshold options prevents this taking ages...
-tests\CodeCoverage\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"dotnet.exe" -targetargs:"test tests\ImageSharp.Tests\ImageSharp.Tests.csproj -c Release /p:codecov=true" -register:user -threshold:10 -oldStyle -safemode:off -output:.\ImageSharp.Coverage.xml -hideskipped:All -returntargetcode -filter:"+[SixLabors.ImageSharp*]*" 
+tests\CodeCoverage\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"dotnet.exe" -targetargs:"test tests\ImageSharp.Tests\ImageSharp.Tests.csproj -c Release -f netcoreapp2.0 /p:codecov=true" -register:user -threshold:10 -oldStyle -safemode:off -output:.\ImageSharp.Coverage.xml -hideskipped:All -returntargetcode -filter:"+[SixLabors.ImageSharp*]*" 
 
 if %errorlevel% neq 0 exit /b %errorlevel%
 
diff --git a/tests/ImageSharp.Tests/RunExtendedTests.cmd b/tests/ImageSharp.Tests/RunExtendedTests.cmd
new file mode 100644
index 000000000..a9b9d260c
--- /dev/null
+++ b/tests/ImageSharp.Tests/RunExtendedTests.cmd
@@ -0,0 +1,6 @@
+dotnet xunit -nobuild -c Release -f net462
+dotnet xunit -nobuild -c Release -f net462 -x86
+dotnet xunit -nobuild -c Release -f net47
+dotnet xunit -nobuild -c Release -f net47 -x86
+dotnet xunit -nobuild -c Release -f net471
+dotnet xunit -nobuild -c Release -f net471 -x86
diff --git a/tests/ImageSharp.Tests/xunit.runner.json b/tests/ImageSharp.Tests/xunit.runner.json
index cbaa8f432..5204242f0 100644
--- a/tests/ImageSharp.Tests/xunit.runner.json
+++ b/tests/ImageSharp.Tests/xunit.runner.json
@@ -1,4 +1,5 @@
 {
-  "methodDisplay": "method",
-  "diagnosticMessages": true
+    "shadowCopy": false,
+    "methodDisplay": "method",
+    "diagnosticMessages": true
 }
\ No newline at end of file