diff --git a/.github/workflows/pr_validate.yml b/.github/workflows/pr_validate.yml
index 9aeba2a0..bf9d9921 100644
--- a/.github/workflows/pr_validate.yml
+++ b/.github/workflows/pr_validate.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        dotnet-version: [ '8.0.x' ]
+        dotnet-version: [ '8.0', '9.0' ]
 
     services:
       fauna:
@@ -23,12 +23,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup dotnet ${{ matrix.dotnet-version }}
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ matrix.dotnet-version }}
       - name: Restore dependencies
-        run: dotnet restore
+        run: dotnet restore --framework net${{ matrix.dotnet-version }}
       - name: Build
-        run: dotnet build --no-restore
+        run: dotnet build --no-restore --framework net${{ matrix.dotnet-version }}
       - name: Test
-        run: dotnet test --no-build --verbosity normal
+        run: dotnet test --no-build --verbosity normal --framework net${{ matrix.dotnet-version }}
diff --git a/Fauna.Test/Fauna.Test.csproj b/Fauna.Test/Fauna.Test.csproj
index 1769fdec..ee6e5653 100644
--- a/Fauna.Test/Fauna.Test.csproj
+++ b/Fauna.Test/Fauna.Test.csproj
@@ -16,6 +16,7 @@
     <PackageReference Include="nunit" Version="3.14.0" />
     <PackageReference Include="nunit3testadapter" Version="4.5.0" />
     <PackageReference Include="Polly" Version="8.3.0" />
+    <PackageReference Include="system.drawing.common" Version="8.0.10" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Performance/setup/*">
@@ -31,7 +32,7 @@
     <Folder Include="Types\" />
   </ItemGroup>
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/Fauna/Fauna.csproj b/Fauna/Fauna.csproj
index 3b98dd9d..6e38716b 100644
--- a/Fauna/Fauna.csproj
+++ b/Fauna/Fauna.csproj
@@ -15,6 +15,9 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
+  <PropertyGroup>
+    <NoWarn>CS8524</NoWarn>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />