diff --git a/.github/workflows/windows-msys2.yml b/.github/workflows/windows-msys2.yml
index a64f30c00..542a07da9 100644
--- a/.github/workflows/windows-msys2.yml
+++ b/.github/workflows/windows-msys2.yml
@@ -131,13 +131,6 @@ jobs:
       - name: Build
         run: cmake --build build --config "Release" --parallel ${{ env.CORES }}
 
-      - name: Find Visual Studio root via vswhere
-        shell: cmd
-        run: |
-          FOR /F "delims=" %%i in ('C:\ProgramData\Chocolatey\bin\vswhere.exe -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath') DO SET "VS_PATH=%%i"
-          echo "Detected Visual Studio path: %VS_PATH%"
-          echo VS_PATH=%VS_PATH%>> "%GITHUB_ENV%"
-
       - name: Test
         run: |
           mkdir -p "build/Testing/Temporary"
@@ -149,20 +142,13 @@ jobs:
           export PATH="$PWD/build/src/lib:$PATH"
           export RNP_LOG_CONSOLE=1
           # Add mt.exe (manifest tool) to PATH
-          vsp=$(cygpath -u "${VS_PATH}")
-          ts_ver=$(<"$vsp/VC/Auxiliary/Build/Microsoft.VCToolsVersion.v143.default.txt")
-          echo "Found TS version: $ts_ver"
-          lib_dir="${vsp}/VC/Tools/MSVC/${ts_ver}/bin/Hostx64/x64"
-          if [[ ! -d "$lib_dir" ]]; then
-            echo "Looks like directory with sanitizer libs changed from ${lib_dir}. Available ones:"
-            ls -la "${vsp}/VC/Tools/MSVC"
-            exit 1
-          fi
           export PATH="$lib_dir":"/c/Program Files (x86)/Windows Kits/10/bin/10.0.22621.0/x64/":$PATH
-          # Add manifest which forces utf-8 encoding
-          find /c/Program\ Files\ \(x86\) -name "mt.exe"
+          #find /c/Program\ Files\ \(x86\) -name "mt.exe"
+          win_sdk=$(reg query "HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots" | awk '{print $3}' | sort -r | head -n 1)
+          echo "Windows SDK: $win_sdk"
           pwd
-          mt.exe -manifest ./ci/utf8-manifest -outputresource:./build/src/tests/rnp_tests;1
+          # Add manifest which forces utf-8 encoding
+          mt.exe -manifest ./ci/utf8-manifest -outputresource:./build/src/tests/rnp_tests.exe;1
           ctest --test-dir build -C Debug -V -R rnp_tests.test_windows_unicode || true
           ctest --parallel ${{ env.CORES }} --test-dir build -C Debug --output-on-failure -R rnp_tests.test_cli_rnpkeys_unicode