diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index ffc2dcec1..aa61cb3b2 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -5,6 +5,8 @@ on:
     branches: [ gcos4gnucobol-3.x ]
   push:
     branches: [ gcos4gnucobol-3.x ]
+  # manual run in actions tab - for all branches
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 352b6282f..a16d542aa 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches: [ gcos4gnucobol-3.x ]
   push:
+    branches: [ gcos4gnucobol-3.x ]
   # manual run in actions tab - for all branches
   workflow_dispatch:
 
diff --git a/.github/workflows/windows-msvc.yml b/.github/workflows/windows-msvc.yml
new file mode 100644
index 000000000..2127ed98a
--- /dev/null
+++ b/.github/workflows/windows-msvc.yml
@@ -0,0 +1,158 @@
+name: Windows MSVC Workflow
+
+on:
+  pull_request:
+    branches: [ gcos4gnucobol-3.x ]
+  push:
+    branches: [ gcos4gnucobol-3.x ]
+  # manual run in actions tab - for all branches
+  workflow_dispatch:
+
+env:
+  FLEXBISON: https://github.com/lexxmark/winflexbison/releases/download/v2.5.25/win_flex_bison-2.5.25.zip
+  MSBUILD: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe
+  VCVARS: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat
+  VCPKG_ROOT: C:\vcpkg
+  VCPKGS: mpir:x64-windows pdcurses:x64-windows berkeleydb:x64-windows libxml2:x64-windows cjson:x64-windows
+  MSYS2_ROOT: C:\msys64
+  MSYSPKGS: autoconf
+  MSYSTEM: UCRT64
+  MSYSTEM_CHOST: x86_64-w64-mingw32
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - windows-latest
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+
+      - name: Set git user
+        run: |
+          git config --global user.name github-actions
+          git config --global user.email github-actions-bot@users.noreply.github.com
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup environment
+        run: echo GITHUB_WORKSPACE=$env:GITHUB_WORKSPACE >> $env:GITHUB_ENV
+
+      - name: Restore VCPKG package cache
+        id: restore-vcpkg
+        uses: actions/cache/restore@v3
+        with:
+          key: cache-vcpkg
+          path: |
+            ${{ env.VCPKG_ROOT }}/installed
+            ${{ env.VCPKG_ROOT }}/packages
+
+      - name: Install VCPKG packages
+        if: steps.restore-vcpkg.outputs.cache-hit != 'true'
+        run: |
+          cd $env:VCPKG_ROOT
+          git pull
+          .\bootstrap-vcpkg.bat -disableMetrics
+          vcpkg integrate install
+          vcpkg install (-split $env:VCPKGS)
+          vcpkg update
+          vcpkg upgrade (-split $env:VCPKGS) --no-dry-run
+
+      - name: Save VCPKG package cache
+        if: steps.restore-vcpkg.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v3
+        with:
+          key: cache-vcpkg
+          path: |
+            ${{ env.VCPKG_ROOT }}/installed
+            ${{ env.VCPKG_ROOT }}/packages
+
+      - name: Restore WinFlexBison cache
+        uses: actions/cache/restore@v3
+        id: restore-flexbison
+        with:
+          key: cache-flexbison
+          path: ${{ env.GITHUB_WORKSPACE }}\flexbison
+
+      - name: Install WinFlexBison
+        if: steps.restore-flexbison.outputs.cache-hit != 'true'
+        run: |
+          Invoke-WebRequest -Uri $env:FLEXBISON -OutFile flexbison.zip
+          Expand-Archive flexbison.zip -DestinationPath flexbison
+
+      - name: Save WinFlexBison cache
+        if: steps.restore-flexbison.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v3
+        with:
+          key: cache-flexbison
+          path: ${{ env.GITHUB_WORKSPACE }}/flexbison
+
+      - name: Configure GnuCOBOL
+        run: |
+          cd build_windows
+          Get-Content -Path 'config.h.in' | ForEach-Object { $_ `
+              -replace '(#define\s+CONFIGURED_ISAM)\s.+$', '$1   BDB' `
+              -replace '(#define\s+CONFIGURED_CURSES)\s.+$', '$1 PDCURSES' `
+              -replace '(#define\s+CONFIGURED_XML)\s.+$', '$1    XML2' `
+              -replace '(#define\s+CONFIGURED_JSON)\s.+$', '$1   CJSON_CJSON' `
+            } | Set-Content -Path 'config.h'
+          & .\maketarstamp.ps1 > tarstamp.h
+
+      - name: Generate parser
+        run: |
+          $env:PATH = "$pwd\flexbison;$env:PATH"
+          cd build_windows
+          cmd /C makebisonflex.cmd
+
+      - name: Build GnuCOBOL
+        run: |
+          cd build_windows
+          vcpkg integrate install
+          & $env:MSBUILD "vs2019\GnuCOBOL.sln" /m /p:Platform=x64 /p:Configuration=Release
+
+      - name: Install MSYS2 packages
+        shell: C:\shells\msys2bash.cmd {0}
+        run: |
+          pacman --needed --noconfirm -S $MSYSPKGS
+
+      - name: Building testsuite
+        shell: C:\shells\msys2bash.cmd {0}
+        run: |
+          cd tests
+          echo at_testdir='tests' > atconfig
+          echo abs_builddir='%cd%' >> atconfig
+          echo at_srcdir='.' >> atconfig
+          echo abs_srcdir='%cd%' >> atconfig
+          echo at_top_srcdir='..' >> atconfig
+          echo abs_top_srcdir='%cd%\..' >> atconfig
+          echo at_top_build_prefix='../' >> atconfig
+          echo abs_top_builddir='%cd%\..' >> atconfig
+          echo at_top_builddir=$at_top_build_prefix >> atconfig
+          echo EXEEXT='.exe' >> atconfig
+          echo AUTOTEST_PATH='tests' >> atconfig
+          echo SHELL=${CONFIG_SHELL-'/bin/sh'} >> atconfig
+          echo m4_define([AT_PACKAGE_STRING], [GnuCOBOL 3.3-dev]) > package.m4
+          echo m4_define([AT_PACKAGE_BUGREPORT], [bug-gnucobol@gnu.org]) >> package.m4
+          sed 's/x64\/Debug/x64\/Release/g' atlocal_win > atlocal
+          sed -i '/AT_SETUP(\[runtime check: write to internal storage (1)\])/a AT_SKIP_IF(\[true\])' testsuite.src/run_misc.at
+          autom4te --lang=autotest -I ./testsuite.src ./testsuite.at -o ./testsuite
+
+      - name: Running testsuite
+        shell: cmd
+        run: |
+          set COB_CFLAGS=/I "%cd%" /I "%VCPKG_ROOT%\installed\x64-windows\include"
+          set COB_LIBS=libcob.lib /LIBPATH:"%cd%\build_windows\x64\Release" /FORCE:MULTIPLE
+          call "%VCVARS%"
+          cd tests
+          bash -c "./testsuite || ./testsuite --recheck --verbose"
+
+      - name: Upload testsuite.log
+        uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: testsuite.log
+          path: ${{ env.GITHUB_WORKSPACE }}/tests/testsuite.log
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows-msys2.yml
similarity index 93%
rename from .github/workflows/windows.yml
rename to .github/workflows/windows-msys2.yml
index e238d741a..c880f28bb 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows-msys2.yml
@@ -1,12 +1,12 @@
-name: Windows Workflow
+name: Windows MSYS2 Workflow
 
 on:
- pull_request:
-   branches: [ gcos4gnucobol-3.x ]
- push:
-   branches: [ gcos4gnucobol-3.x ]
+  pull_request:
+    branches: [ gcos4gnucobol-3.x ]
+  push:
+    branches: [ gcos4gnucobol-3.x ]
   # manual run in actions tab - for all branches
-  # workflow_dispatch:
+  workflow_dispatch:
 
 jobs:
   build: