diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b5d3f49e..20b40103 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,11 @@ on:
 jobs:
   build:
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        framework:
+          - 8.0
+          - 9.0
     steps:
       - uses: actions/checkout@v4
         with:
@@ -15,8 +20,8 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.x
+          dotnet-version: ${{ matrix.framework }}.x
       - name: Build
-        run: dotnet build -c Release
+        run: dotnet build -c Release --framework net${{ matrix.framework }}
       - name: Test
-        run: dotnet test -c Release --no-build
+        run: dotnet test -c Release --framework net${{ matrix.framework }} --no-build
diff --git a/Docker.DotNet.sln b/Docker.DotNet.sln
index 1fce2955..4f5c8352 100644
--- a/Docker.DotNet.sln
+++ b/Docker.DotNet.sln
@@ -15,10 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docker.DotNet.X509", "src\D
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docker.DotNet.Tests", "test\Docker.DotNet.Tests\Docker.DotNet.Tests.csproj", "{248C5D51-2B33-4A06-A0EA-AA709F752E52}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Docker.DotNet.JsonSerializer8.Tests", "test\Docker.DotNet.JsonSerializer8.Tests\Docker.DotNet.JsonSerializer8.Tests.csproj", "{51D89ABF-A08A-4CE8-8AEA-DA65FEDA8676}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Docker.DotNet.JsonSerializer9.Tests", "test\Docker.DotNet.JsonSerializer9.Tests\Docker.DotNet.JsonSerializer9.Tests.csproj", "{F3F00DC7-2C56-4483-B97C-91940DF15178}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -77,30 +73,6 @@ Global
 		{248C5D51-2B33-4A06-A0EA-AA709F752E52}.Release|x64.Build.0 = Release|Any CPU
 		{248C5D51-2B33-4A06-A0EA-AA709F752E52}.Release|x86.ActiveCfg = Release|Any CPU
 		{248C5D51-2B33-4A06-A0EA-AA709F752E52}.Release|x86.Build.0 = Release|Any CPU
-		{51D89ABF-A08A-4CE8-8AEA-DA65FEDA8676}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{51D89ABF-A08A-4CE8-8AEA-DA65FEDA8676}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{51D89ABF-A08A-4CE8-8AEA-DA65FEDA8676}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{51D89ABF-A08A-4CE8-8AEA-DA65FEDA8676}.Debug|x64.Build.0 = Debug|Any CPU
-		{51D89ABF-A08A-4CE8-8AEA-DA65FEDA8676}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{51D89ABF-A08A-4CE8-8AEA-DA65FEDA8676}.Debug|x86.Build.0 = Debug|Any CPU
-		{51D89ABF-A08A-4CE8-8AEA-DA65FEDA8676}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{51D89ABF-A08A-4CE8-8AEA-DA65FEDA8676}.Release|Any CPU.Build.0 = Release|Any CPU
-		{51D89ABF-A08A-4CE8-8AEA-DA65FEDA8676}.Release|x64.ActiveCfg = Release|Any CPU
-		{51D89ABF-A08A-4CE8-8AEA-DA65FEDA8676}.Release|x64.Build.0 = Release|Any CPU
-		{51D89ABF-A08A-4CE8-8AEA-DA65FEDA8676}.Release|x86.ActiveCfg = Release|Any CPU
-		{51D89ABF-A08A-4CE8-8AEA-DA65FEDA8676}.Release|x86.Build.0 = Release|Any CPU
-		{F3F00DC7-2C56-4483-B97C-91940DF15178}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3F00DC7-2C56-4483-B97C-91940DF15178}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3F00DC7-2C56-4483-B97C-91940DF15178}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F3F00DC7-2C56-4483-B97C-91940DF15178}.Debug|x64.Build.0 = Debug|Any CPU
-		{F3F00DC7-2C56-4483-B97C-91940DF15178}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F3F00DC7-2C56-4483-B97C-91940DF15178}.Debug|x86.Build.0 = Debug|Any CPU
-		{F3F00DC7-2C56-4483-B97C-91940DF15178}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3F00DC7-2C56-4483-B97C-91940DF15178}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3F00DC7-2C56-4483-B97C-91940DF15178}.Release|x64.ActiveCfg = Release|Any CPU
-		{F3F00DC7-2C56-4483-B97C-91940DF15178}.Release|x64.Build.0 = Release|Any CPU
-		{F3F00DC7-2C56-4483-B97C-91940DF15178}.Release|x86.ActiveCfg = Release|Any CPU
-		{F3F00DC7-2C56-4483-B97C-91940DF15178}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -110,7 +82,5 @@ Global
 		{E1F24B25-E027-45E0-A6E1-E08138F1F95D} = {85990620-78A6-4381-8BD6-84E6D0CF0649}
 		{89BD76AD-78C9-4E4A-96A2-E5DA6D4AFA44} = {85990620-78A6-4381-8BD6-84E6D0CF0649}
 		{248C5D51-2B33-4A06-A0EA-AA709F752E52} = {AA4B8CC2-1431-4FC7-9DF3-533EC6C86D3A}
-		{51D89ABF-A08A-4CE8-8AEA-DA65FEDA8676} = {AA4B8CC2-1431-4FC7-9DF3-533EC6C86D3A}
-		{F3F00DC7-2C56-4483-B97C-91940DF15178} = {AA4B8CC2-1431-4FC7-9DF3-533EC6C86D3A}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index c6ac8527..7a0e7a11 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
 
     <PropertyGroup>
         <IsPackable>true</IsPackable>
-        <TargetFrameworks>net6.0;net8.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0;netstandard2.0;netstandard2.1</TargetFrameworks>
         <PackageIconUrl>https://camo.githubusercontent.com/fa6d5c12609ed8a3ba1163b96f9e9979b8f59b0d/687474703a2f2f7765732e696f2f566663732f636f6e74656e74</PackageIconUrl>
         <Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
         <PackageTags>Docker Container C# .NET</PackageTags>
diff --git a/src/Docker.DotNet/Docker.DotNet.csproj b/src/Docker.DotNet/Docker.DotNet.csproj
index 07a06a97..11945181 100644
--- a/src/Docker.DotNet/Docker.DotNet.csproj
+++ b/src/Docker.DotNet/Docker.DotNet.csproj
@@ -11,4 +11,9 @@
     <PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
     <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
+  <ItemGroup Condition="$(TargetFrameworkIdentifier) == 'net9.0'">
+    <PackageReference Include="System.IO.Pipelines" Version="9.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
+    <PackageReference Include="System.Text.Json" Version="9.0.0" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/Docker.DotNet.JsonSerializer8.Tests/Docker.DotNet.JsonSerializer8.Tests.csproj b/test/Docker.DotNet.JsonSerializer8.Tests/Docker.DotNet.JsonSerializer8.Tests.csproj
deleted file mode 100644
index 26e85ac2..00000000
--- a/test/Docker.DotNet.JsonSerializer8.Tests/Docker.DotNet.JsonSerializer8.Tests.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <IsPublishable>false</IsPublishable>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Docker.DotNet\Docker.DotNet.csproj" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Docker.DotNet.JsonSerializer8.Tests/Usings.cs b/test/Docker.DotNet.JsonSerializer8.Tests/Usings.cs
deleted file mode 100644
index b8377da7..00000000
--- a/test/Docker.DotNet.JsonSerializer8.Tests/Usings.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-global using System.Text;
-global using Docker.DotNet.Models;
-global using Xunit;
\ No newline at end of file
diff --git a/test/Docker.DotNet.JsonSerializer9.Tests/Docker.DotNet.JsonSerializer9.Tests.csproj b/test/Docker.DotNet.JsonSerializer9.Tests/Docker.DotNet.JsonSerializer9.Tests.csproj
deleted file mode 100644
index a89096c8..00000000
--- a/test/Docker.DotNet.JsonSerializer9.Tests/Docker.DotNet.JsonSerializer9.Tests.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <IsPublishable>false</IsPublishable>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="System.IO.Pipelines" Version="9.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
-    <PackageReference Include="System.Text.Json" Version="9.0.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Docker.DotNet\Docker.DotNet.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Docker.DotNet.JsonSerializer8.Tests\*.cs"/>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/test/Docker.DotNet.Tests/Docker.DotNet.Tests.csproj b/test/Docker.DotNet.Tests/Docker.DotNet.Tests.csproj
index cf8e7333..8408738a 100644
--- a/test/Docker.DotNet.Tests/Docker.DotNet.Tests.csproj
+++ b/test/Docker.DotNet.Tests/Docker.DotNet.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <IsPublishable>false</IsPublishable>
   </PropertyGroup>
diff --git a/test/Docker.DotNet.JsonSerializer8.Tests/JsonEnumMemberConverterTest.cs b/test/Docker.DotNet.Tests/JsonEnumMemberConverterTest.cs
similarity index 95%
rename from test/Docker.DotNet.JsonSerializer8.Tests/JsonEnumMemberConverterTest.cs
rename to test/Docker.DotNet.Tests/JsonEnumMemberConverterTest.cs
index ec23c416..b11d3f2b 100644
--- a/test/Docker.DotNet.JsonSerializer8.Tests/JsonEnumMemberConverterTest.cs
+++ b/test/Docker.DotNet.Tests/JsonEnumMemberConverterTest.cs
@@ -1,5 +1,9 @@
 namespace Docker.DotNet.JsonSerializer8.Tests;
 
+using System.Text;
+using Docker.DotNet.Models;
+using Xunit;
+
 public sealed class JsonEnumMemberConverterTests
 {
     [Theory]