diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 579a547ea..4da7813a8 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -15,48 +15,39 @@ jobs:
             matrix:
                 options:
                     - os: ubuntu-latest
-                      framework-build: netcoreapp3.1
-                      framework-test: net5.0
+                      framework: net5.0
                       runtime: -x64
                       codecov: false
                     - os: macos-latest
-                      framework-build: netcoreapp3.1
-                      framework-test: net5.0
+                      framework: net5.0
                       runtime: -x64
                       codecov: false
                     - os: windows-latest
-                      framework-build: netcoreapp3.1
-                      framework-test: net5.0
+                      framework: net5.0
                       runtime: -x64
                       codecov: false
                     - os: ubuntu-latest
-                      framework-build: netcoreapp3.1
-                      framework-test: netcoreapp3.1
+                      framework: netcoreapp3.1
                       runtime: -x64
                       codecov: true
                     - os: macos-latest
-                      framework-build: netcoreapp3.1
-                      framework-test: netcoreapp3.1
+                      framework: netcoreapp3.1
                       runtime: -x64
                       codecov: false
                     - os: windows-latest
-                      framework-build: netcoreapp3.1
-                      framework-test: netcoreapp3.1
+                      framework: netcoreapp3.1
                       runtime: -x64
                       codecov: false
                     - os: windows-latest
-                      framework-build: netcoreapp2.1
-                      framework-test: netcoreapp2.1
+                      framework: netcoreapp2.1
                       runtime: -x64
                       codecov: false
                     - os: windows-latest
-                      framework-build: net472
-                      framework-test: net472
+                      framework: net472
                       runtime: -x64
                       codecov: false
                     - os: windows-latest
-                      framework-build: net472
-                      framework-test: net472
+                      framework: net472
                       runtime: -x86
                       codecov: false
 
@@ -87,11 +78,11 @@ jobs:
 
             - name: Build
               shell: pwsh
-              run: ./ci-build.ps1 "${{matrix.options.framework-build}}"
+              run: ./ci-build.ps1 "${{matrix.options.framework}}"
 
             - name: Test
               shell: pwsh
-              run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework-test}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}"
+              run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}"
               env:
                   CI: True
                   XUNIT_PATH: .\tests\ImageSharp.Tests # Required for xunit
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
index a90aaf715..e0da2abf0 100644
--- a/src/ImageSharp/ImageSharp.csproj
+++ b/src/ImageSharp/ImageSharp.csproj
@@ -12,9 +12,16 @@
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
     <PackageTags>Image Resize Crop Gif Jpg Jpeg Bitmap Png Tga NetCore</PackageTags>
     <Description>A new, fully featured, fully managed, cross-platform, 2D graphics API for .NET</Description>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$(CI) == false" >
     <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net472</TargetFrameworks>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$(CI) == true">
+    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net472</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Include="..\..\shared-infrastructure\branding\icons\imagesharp\sixlabors.imagesharp.128.png" Pack="true" PackagePath="" />
   </ItemGroup>