diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d61e3350c..3d1d66f5f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,11 +28,15 @@ jobs:
         uses: actions/checkout@v2.3.4
         with:
           fetch-depth: 0
-      - name: Setup .NET SDK
+      - name: Install .NET SDK
+        uses: actions/setup-dotnet@v1.8.1
+        with:
+          dotnet-version: 6.0.x
+      - name: Install .NET 5 runtime
         uses: actions/setup-dotnet@v1.8.1
         with:
           dotnet-version: 5.0.x
-      - name: Setup .NET Core 3.1 runtime
+      - name: Install .NET Core 3.1 runtime
         uses: actions/setup-dotnet@v1.8.1
         with:
           dotnet-version: 3.1.x
@@ -52,3 +56,5 @@ jobs:
         run: dotnet test LibGit2Sharp.sln --configuration Release --no-restore --framework netcoreapp3.1 --logger "GitHubActions" /p:ExtraDefine=LEAKS_IDENTIFYING
       - name: Run net5.0 tests
         run: dotnet test LibGit2Sharp.sln --configuration Release --no-restore --framework net5.0 --logger "GitHubActions" /p:ExtraDefine=LEAKS_IDENTIFYING
+      - name: Run net6.0 tests
+        run: dotnet test LibGit2Sharp.sln --configuration Release --no-restore --framework net6.0 --logger "GitHubActions" /p:ExtraDefine=LEAKS_IDENTIFYING
diff --git a/LibGit2Sharp.Tests/BlobFixture.cs b/LibGit2Sharp.Tests/BlobFixture.cs
index f39429b74..98b30dcfc 100644
--- a/LibGit2Sharp.Tests/BlobFixture.cs
+++ b/LibGit2Sharp.Tests/BlobFixture.cs
@@ -43,7 +43,7 @@ public void CanGetBlobAsFilteredText(string autocrlf, string expectedText)
             }
         }
 
-#if NETFRAMEWORK || NETCOREAPP3_1 //UTF-7 is disabled in .NET 5
+#if NETFRAMEWORK || NETCOREAPP3_1 //UTF-7 is disabled in .NET 5+
         [Theory]
         [InlineData("ascii", 4, "31 32 33 34")]
         [InlineData("utf-7", 4, "31 32 33 34")]
diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
index 24e558461..771b75696 100644
--- a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
+++ b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>