diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9e902268..481a122d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,6 +3,9 @@ name: ci
 on: [push, pull_request]
 
 jobs:
+  # ---------------------------------------------------------------------------------
+  # Linux
+  # ---------------------------------------------------------------------------------
   build_linux:
     runs-on: ubuntu-latest
     defaults:
@@ -56,6 +59,9 @@ jobs:
           make -j2
           ctest -j2 --output-on-failure
 
+  # ---------------------------------------------------------------------------------
+  # OSX
+  # ---------------------------------------------------------------------------------
   build_osx:
     runs-on: macOS-latest
     name: "OS X Clang (C++11, Release)"
@@ -76,10 +82,20 @@ jobs:
             -DSPDLOG_SANITIZE_ADDRESS=OFF
           make -j2
           ctest -j2 --output-on-failure
-
+# ---------------------------------------------------------------------------------
+# Windows
+# ---------------------------------------------------------------------------------
   build_windows:
     runs-on: windows-latest
-    name: "Windows MSVC 2022 (C++11, Release)"
+    strategy:
+      matrix:
+        msvc_version:
+          - { name: "Visual Studio 15 2017", generator: "Visual Studio 15 2017" }
+          - { name: "Visual Studio 16 2019", generator: "Visual Studio 16 2019" }
+          - { name: "Visual Studio 17 2022", generator: "Visual Studio 17 2022" }
+
+    name: "Windows ${{ matrix.msvc_version.name }} (C++11, Release)"
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -92,7 +108,7 @@ jobs:
 
       - name: Configure CMake
         run: |
-          cmake -S . -B build -G "Visual Studio 17 2022" -A x64 
+          cmake -S . -B build -G "${{ matrix.msvc_version.generator }}" -A x64 
             -DCMAKE_BUILD_TYPE=Release 
             -DCMAKE_CXX_STANDARD=11
             -DSPDLOG_BUILD_EXAMPLE=ON