diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index dab230e..8aab181 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -36,24 +36,16 @@ jobs:
 
   MSYS2:
     runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      max-parallel: 2
-      matrix:
-        include: [
-          {icon: '⬛', sys: 'MINGW32', arch: i686,   pkg: 'mcode' },
-          {icon: '🟦', sys: 'MINGW64', arch: x86_64, pkg: 'llvm'  },
-        ]
-    name: '${{ matrix.icon }} ${{ matrix.sys }} · ${{ matrix.pkg }}'
+    name: '🟦 MINGW64 · LLVM'
     defaults:
       run:
         shell: msys2 {0}
     steps:
 
-    - name: '${{ matrix.icon }} Setup MSYS2'
+    - name: '🟦 Setup MSYS2'
       uses: msys2/setup-msys2@v2
       with:
-        msystem: ${{ matrix.sys }}
+        msystem: MINGW64
         update: true
 
     - name: '⚙️ git config'
diff --git a/doc/setup.msys2.sh b/doc/setup.msys2.sh
index 6e88cfb..1c646cc 100644
--- a/doc/setup.msys2.sh
+++ b/doc/setup.msys2.sh
@@ -26,11 +26,11 @@ pacman -Syu --noconfirm
 
 # Install the dependencies for simulation and synthesis of VHDL is FLOSS tools
 pacman -S --noconfirm p7zip git \
-    mingw-w64-"${MSYSTEM_CARCH}"-yosys \
-    mingw-w64-"${MSYSTEM_CARCH}"-gtkwave \
-    mingw-w64-"${MSYSTEM_CARCH}"-python-pip \
-    mingw-w64-"${MSYSTEM_CARCH}"-python-setuptools \
-    mingw-w64-"${MSYSTEM_CARCH}"-python-wheel
+    mingw-w64-x86_64-yosys \
+    mingw-w64-x86_64-gtkwave \
+    mingw-w64-x86_64-python-pip \
+    mingw-w64-x86_64-python-setuptools \
+    mingw-w64-x86_64-python-wheel
 
 if [ -d vunit ]; then
   printf "\033[31mSubdir 'vunit' exists already.\033[0m\n"