diff --git a/.github/workflows/run_matlab_tests.yml b/.github/workflows/run_matlab_tests.yml
index 13967fbd..5a87934c 100644
--- a/.github/workflows/run_matlab_tests.yml
+++ b/.github/workflows/run_matlab_tests.yml
@@ -4,12 +4,12 @@ on: [pull_request]
 
 env:
   BUILD_FOLDER: build
-  EXAMPLES_FOLDER: examples
 
 jobs:
   build:
     strategy:
       matrix:
+        version: [R2021b, R2022a, R2022b, R2023a, R2023b, R2024a]
         include:
           - os: ubuntu-latest
             label: linux-64
@@ -20,8 +20,10 @@ jobs:
           - os: windows-latest
             label: win-64
             prefix: C:\Miniconda3\envs\ezc3d
-          - version: [R2021b, R2022a, R2022b, R2023a, R2023b, R2024a]
-    name: ${{ matrix.label }}
+        exclude:
+          - os: macos-latest
+            version: [R2023b]
+    name: ${{ matrix.label }}_${{ matrix.version }}
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -54,8 +56,10 @@ jobs:
 
       - name: Install MATLAB
         uses: matlab-actions/setup-matlab@v2
+        with:
+          release: ${{ matrix.version }}
 
-      - name: Build ezc3d
+      - name: Build ezc3d on UNIX
         run: |
           MAIN_FOLDER=`pwd`
           cd
@@ -64,9 +68,21 @@ jobs:
           CONDA_ENV_PATH=$CONDA/envs/ezc3d
           mkdir -p $MAIN_FOLDER/$BUILD_FOLDER
           cd $MAIN_FOLDER/$BUILD_FOLDER
-          cmake -DCMAKE_INSTALL_PREFIX=$CONDA_ENV_PATH -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON -DBUILD_DOC=OFF -DBUILD_EXAMPLE=OFF -DUSE_MATRIX_FAST_ACCESSOR=OFF -DBINDER_MATLAB=ON -DMatlab_ezc3d_INSTALL_DIR=$HOME -DBINDER_PYTHON3=OFF ..
+          cmake -DCMAKE_INSTALL_PREFIX=$CONDA_ENV_PATH -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_DOC=OFF -DBUILD_EXAMPLE=OFF -DUSE_MATRIX_FAST_ACCESSOR=OFF -DBINDER_MATLAB=ON -DMatlab_ezc3d_INSTALL_DIR=$HOME -DBINDER_PYTHON3=OFF ..
           make install -j${{ steps.cpu-cores.outputs.count }}
           cd $MAIN_FOLDER
+        if: matrix.label != 'win-64'
+      
+      - name: Build ezc3d on WINDOWS
+        run: |
+          MAIN_FOLDER=`pwd`
+          CONDA_ENV_PATH=$CONDA/envs/ezc3d
+          mkdir -p $BUILD_FOLDER
+          cd $BUILD_FOLDER
+          cmake -G"Visual Studio 17 2022" -Ax64 -DCMAKE_INSTALL_PREFIX=$CONDA_ENV_PATH -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_DOC=OFF -DBUILD_EXAMPLE=OFF -DUSE_MATRIX_FAST_ACCESSOR=OFF -DBINDER_MATLAB=ON -DMatlab_ezc3d_INSTALL_DIR=$HOME -DBINDER_PYTHON3=OFF ..
+          cmake --build . --config Release --target install -j${{ steps.cpu-cores.outputs.count }}
+          cd $MAIN_FOLDER
+        if: matrix.label == 'win-64'
 
       - name: Run the MATLAB binder tests
         run: |
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 5255a396..ca465cbf 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -74,7 +74,6 @@ jobs:
       - name: Build ezc3d WINDOWS
         run: |
           MAIN_FOLDER=`pwd`
-          echo ${{ matrix.prefix }}
           CONDA_ENV_PATH=$CONDA/envs/ezc3d
           mkdir -p $BUILD_FOLDER
           cd $BUILD_FOLDER