diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
index b5c181e47..53fbf4330 100644
--- a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
+++ b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net472</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
     <DefineConstants Condition=" '$(TargetFramework)' == 'net472' ">$(DefineConstants);DESKTOP</DefineConstants>
   </PropertyGroup>
 
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
index c2254ca91..17b733db2 100644
--- a/LibGit2Sharp/LibGit2Sharp.csproj
+++ b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net472</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>LibGit2Sharp brings all the might and speed of libgit2, a native Git implementation, to the managed world of .Net and Mono.</Description>
     <Company>LibGit2Sharp contributors</Company>
diff --git a/appveyor.yml b/appveyor.yml
index ea3e2eef9..8216822f1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -90,20 +90,20 @@ test_script:
       {
         .\packages\OpenCover\tools\OpenCover.Console.exe `
           -register:user `
-          "-target:""$Env:userprofile\.nuget\packages\xunit.runner.console\2.4.0\tools\net461\$runner""" `
-          "-targetargs:""$Env:APPVEYOR_BUILD_FOLDER\bin\LibGit2Sharp.Tests\Release\net461\LibGit2Sharp.Tests.dll"" -noshadow" `
+          "-target:""$Env:userprofile\.nuget\packages\xunit.runner.console\2.4.0\tools\net472\$runner""" `
+          "-targetargs:""$Env:APPVEYOR_BUILD_FOLDER\bin\LibGit2Sharp.Tests\Release\net472\LibGit2Sharp.Tests.dll"" -noshadow" `
           "-filter:+[LibGit2Sharp]* -[LibGit2Sharp.Tests]*" `
           -hideskipped:All `
           -output:opencoverCoverage.xml
       }
       ElseIf ($Env:SHOULD_RUN_COVERITY_ANALYSIS -eq $False)
       {
-        & "$Env:userprofile\.nuget\packages\xunit.runner.console\2.4.0\tools\net461\$runner" `
-            "$Env:APPVEYOR_BUILD_FOLDER\bin\LibGit2Sharp.Tests\Release\net461\LibGit2Sharp.Tests.dll" -noshadow
+        & "$Env:userprofile\.nuget\packages\xunit.runner.console\2.4.0\tools\net472\$runner" `
+            "$Env:APPVEYOR_BUILD_FOLDER\bin\LibGit2Sharp.Tests\Release\net472\LibGit2Sharp.Tests.dll" -noshadow
       }
     }
 
-- dotnet test LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj -f netcoreapp2.0 --no-restore --no-build
+- dotnet test LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj -f netcoreapp2.1 --no-restore --no-build
 
 after_test:
 - ps: |
diff --git a/buildandtest.cmd b/buildandtest.cmd
index 93090259b..0efa19348 100644
--- a/buildandtest.cmd
+++ b/buildandtest.cmd
@@ -31,9 +31,9 @@ dotnet build "%~dp0\" /v:minimal /nologo /property:ExtraDefine="%EXTRADEFINE%"
 @IF ERRORLEVEL 1 EXIT /B %ERRORLEVEL%
 
 :: Run tests on Desktop and CoreCLR
-"%userprofile%\.nuget\packages\xunit.runner.console\2.4.0\tools\net452\xunit.console.exe" "%~dp0bin\LibGit2Sharp.Tests\%Configuration%\net461\LibGit2Sharp.Tests.dll" -noshadow
+"%userprofile%\.nuget\packages\xunit.runner.console\2.4.0\tools\net452\xunit.console.exe" "%~dp0bin\LibGit2Sharp.Tests\%Configuration%\net472\LibGit2Sharp.Tests.dll" -noshadow
 @IF ERRORLEVEL 1 EXIT /B %ERRORLEVEL%
-dotnet test "%~dp0LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj" -f netcoreapp2.0 --no-restore --no-build
+dotnet test "%~dp0LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj" -f netcoreapp2.1 --no-restore --no-build
 @IF ERRORLEVEL 1 EXIT /B %ERRORLEVEL%
 
 EXIT /B %ERRORLEVEL%
diff --git a/buildandtest.sh b/buildandtest.sh
index a5501a042..6fdebe70d 100755
--- a/buildandtest.sh
+++ b/buildandtest.sh
@@ -15,7 +15,7 @@ export Configuration=release
 # On linux we don't pack because we can't build for net40.
 # We just build for CoreCLR and run tests for it.
 dotnet restore
-dotnet build LibGit2Sharp.Tests -f netcoreapp2.0 -property:ExtraDefine="$EXTRADEFINE" -fl -flp:verbosity=detailed
-dotnet test LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj -f netcoreapp2.0 --no-restore --no-build 
+dotnet build LibGit2Sharp.Tests -f netcoreapp2.1 -property:ExtraDefine="$EXTRADEFINE" -fl -flp:verbosity=detailed
+dotnet test LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj -f netcoreapp2.1 --no-restore --no-build
 
 exit $?