diff --git a/Refit.Tests/InterfaceStubGenerator.cs b/Refit.Tests/InterfaceStubGenerator.cs
index adfc35bfb..153dfb302 100644
--- a/Refit.Tests/InterfaceStubGenerator.cs
+++ b/Refit.Tests/InterfaceStubGenerator.cs
@@ -30,11 +30,11 @@ public class InterfaceStubGeneratorTests
 
         static InterfaceStubGeneratorTests()
         {
-#if NET5_0
+#if NET5_0_OR_GREATER
             ReferenceAssemblies = ReferenceAssemblies.Net.Net50;
 #else
             ReferenceAssemblies = ReferenceAssemblies.Default
-                .AddPackages(ImmutableArray.Create(new PackageIdentity("System.Text.Json", "5.0.1")));
+                .AddPackages(ImmutableArray.Create(new PackageIdentity("System.Text.Json", "6.0.1")));
 #endif
 
 #if NET461
@@ -64,7 +64,7 @@ public void GenerateInterfaceStubsSmokeTest()
             Assert.Empty(diags.Where(d => d.Severity == DiagnosticSeverity.Error));
 
             var rundriver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out var outputCompiliation, out var diagnostics);
-            
+
             var runResult = rundriver.GetRunResult();
 
             var generated = runResult.Results[0];
@@ -858,7 +858,7 @@ public interface IBoringCrudApi<T, in TKey> where T : class
         Task<T> ReadOne(TKey key);
 
         [Put("/{key}")]
-        Task Update(TKey key, [Body]T payload);
+        Task Update(TKey key, [Body] T payload);
 
         [Delete("/{key}")]
         Task Delete(TKey key);
diff --git a/Refit.Tests/Refit.Tests.csproj b/Refit.Tests/Refit.Tests.csproj
index 8f40acb3d..42554e180 100644
--- a/Refit.Tests/Refit.Tests.csproj
+++ b/Refit.Tests/Refit.Tests.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\Refit\targets\refit.props"/>
+  <Import Project="..\Refit\targets\refit.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp2.1;netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0;netcoreapp3.1;net461</TargetFrameworks>
     <Deterministic>false</Deterministic> <!-- Some tests rely on CallerFilePath -->
   </PropertyGroup>
 
@@ -18,13 +18,12 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="System.Reactive" Version="5.0.0" />    
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.0-4.21423.7" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.0" />
     <PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
     <ProjectReference Include="..\Refit.HttpClientFactory\Refit.HttpClientFactory.csproj" />
     <ProjectReference Include="..\Refit.Newtonsoft.Json\Refit.Newtonsoft.Json.csproj" />
-    <ProjectReference Include="..\InterfaceStubGenerator.Roslyn38\InterfaceStubGenerator.Roslyn38.csproj"
-                            OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
+    <ProjectReference Include="..\InterfaceStubGenerator.Roslyn38\InterfaceStubGenerator.Roslyn38.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
     <ProjectReference Include="..\InterfaceStubGenerator.Roslyn40\InterfaceStubGenerator.Roslyn40.csproj" />
   </ItemGroup>
 
@@ -32,5 +31,5 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
 
-  <Import Project="..\Refit\targets\refit.targets"/>
+  <Import Project="..\Refit\targets\refit.targets" />
 </Project>
diff --git a/Refit/Refit.csproj b/Refit/Refit.csproj
index d7981364e..cd645a1eb 100644
--- a/Refit/Refit.csproj
+++ b/Refit/Refit.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Condition="'$(TargetFramework)' != 'net5.0'" Include="System.Text.Json" Version="5.0.2" />
-    <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
+    <PackageReference Condition="'$(TargetFramework)' != 'net6.0'" Include="System.Text.Json" Version="6.0.1" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">