diff --git a/.github/workflows/d3d11-test.yml b/.github/workflows/d3d11-test-msys2.yml
similarity index 100%
rename from .github/workflows/d3d11-test.yml
rename to .github/workflows/d3d11-test-msys2.yml
diff --git a/.github/workflows/d3d11-test-windows.yml b/.github/workflows/d3d11-test-windows.yml
new file mode 100644
index 0000000..e309957
--- /dev/null
+++ b/.github/workflows/d3d11-test-windows.yml
@@ -0,0 +1,89 @@
+name: D3D11-Unit-Tests
+
+on:
+  pull_request:
+  push:
+    paths-ignore:
+      - '.github/workflows/macos-build.yml'
+      - '.github/workflows/msys2-build.yml'
+      - '.github/workflows/windows-build.yml'
+      - '.github/workflows/linux-build.yml'
+      - '.github/workflows/opengl-es-test.yml'
+      - '.github/workflows/vulkan-test.yml'
+      - '.github/workflows/opengl-test.yml'
+      - '.github/workflows/software-test.yml'
+      - '.gitignore'
+      - 'LICENSE'
+      - 'CHANGELOG.md'
+      - 'README.md'
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        msystem: [mingw64]
+        os: [windows-latest]
+        arch: [x86_64]
+        confs:
+        - { mode: debug, archive: yes }
+
+    runs-on: ${{ matrix.os }}
+    if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
+
+    steps:
+    - name: Get current date as package key
+      id: cache_key
+      run: echo "key=$(date +'%W')" >> $GITHUB_OUTPUT
+
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Force xmake to a specific folder (for cache)
+    - name: Set xmake env
+      run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV
+
+    # Install xmake
+    - name: Setup xmake
+      uses: xmake-io/github-action-setup-xmake@v1
+      with:
+        xmake-version: branch@dev
+        actions-cache-folder: .xmake-cache-W${{ steps.cache_key.outputs.key }}
+
+    # Update xmake repository (in order to have the file that will be cached)
+    - name: Update xmake repository
+      run: xmake repo --update
+
+    # Fetch xmake dephash
+    - name: Retrieve dependencies hash
+      id: dep_hash
+      run: echo "hash=$(xmake l utils.ci.packageskey)" >> $GITHUB_OUTPUT
+
+    # Cache xmake dependencies
+    - name: Restore cached xmake dependencies
+      id: restore-depcache
+      uses: actions/cache/restore@v4
+      with:
+        path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
+        key: Linux-${{ matrix.arch }}-${{ matrix.confs.mode }}${{ matrix.confs.cache_key }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.cache_key.outputs.key }}
+
+    # Setup compilation mode and install project dependencies
+    - name: Configure xmake and install dependencies
+      run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.confs.mode }} ${{ matrix.confs.config }} --ccache=n --unitybuild=y --yes
+
+    # Save dependencies
+    - name: Save cached xmake dependencies
+      if: ${{ !steps.restore-depcache.outputs.cache-hit }}
+      uses: actions/cache/save@v4
+      with:
+        path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
+        key: ${{ steps.restore-depcache.outputs.cache-primary-key }}
+
+    # Cache assets downloading
+    - name: Restore cached assets
+      id: restore-assets
+      uses: actions/cache/restore@v4
+      with:
+        path: assets
+        key: assets-${{ hashFiles('assets/examples_version.txt', 'assets/unittests_version.txt') }}
+