diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 11762a875..8c700af49 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,9 +16,11 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - category: windows
-            platform: x86
-            instance: windows-latest
+          # Disabled for now, will require some work (#2653)
+          #
+          # - category: windows
+          #   platform: x86
+          #   instance: windows-latest
 
           - category: windows
             platform: x64
@@ -38,14 +40,6 @@ jobs:
 
         python: ["3.10", "3.11", "3.12", "3.13"]
 
-        # This fails in pytest with:
-        # CSC : error CS4023: /platform:anycpu32bitpreferred can only be used with /t:exe, /t:winexe and /t:appcontainerexe [D:\a\pythonnet\pythonnet\src\runtime\Python.Runtime.csproj]
-        exclude:
-          - os:
-              category: windows
-              platform: x86
-            python: "3.13"
-
     steps:
       - name: Set Environment on macOS
         uses: maxim-lobanov/setup-xamarin@v1
@@ -69,18 +63,24 @@ jobs:
           activate-environment: true
           enable-cache: true
 
-      - name: Embedding tests
-        run: dotnet test --runtime any-${{ matrix.os.platform }} --logger "console;verbosity=detailed" src/embed_tests/
+      - name: Synchronize the virtual environment
+        run: uv sync
+
+      - name: Embedding tests (Mono/.NET Framework)
+        run: dotnet test --runtime any-${{ matrix.os.platform }} --framework net472 --logger "console;verbosity=detailed" src/embed_tests/
+        if: always()
         env:
           MONO_THREADS_SUSPEND: preemptive # https://github.com/mono/mono/issues/21466
 
+      - name: Embedding tests (.NET Core)
+        run: dotnet test --runtime any-${{ matrix.os.platform }} --framework net8.0 --logger "console;verbosity=detailed" src/embed_tests/
+        if: always()
+
       - name: Python Tests (Mono)
         if: ${{ matrix.os.category != 'windows' }}
         run: pytest --runtime mono
 
-      # TODO: Run these tests on Windows x86
       - name: Python Tests (.NET Core)
-        if: ${{ matrix.os.platform == 'x64' }}
         run: pytest --runtime coreclr
 
       - name: Python Tests (.NET Framework)
@@ -88,6 +88,4 @@ jobs:
         run: pytest --runtime netfx
 
       - name: Python tests run from .NET
-        run: uv run dotnet test --runtime any-${{ matrix.os.platform }} src/python_tests_runner/
-
-      # TODO: Run mono tests on Windows?
+        run: dotnet test --runtime any-${{ matrix.os.platform }} src/python_tests_runner/