diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d75d41e07..969fc54a2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -41,6 +41,8 @@ jobs:
 
       - bash: |
           set -e
+          # https://developercommunity.visualstudio.com/content/problem/891929/windows-2019-cygheap-base-mismatch-detected-git-ba.html
+          export PATH="/mingw64/bin:/usr/bin:$PATH"
           echo "Installing MinGW-w64"
           if [[ $PLATFORM == "x86" ]]; then
             MINGW_FILE="i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z"
@@ -64,6 +66,7 @@ jobs:
           export PATH="/c/custom/${MINGW_DIR}/bin:$PATH"
           echo "Fetching submodules"
           git config --global core.longpaths true
+          git config --global core.autocrlf false
           git submodule --quiet update --init --recursive
           scripts/setup_official_tests.sh jsonTestsCache
           mingw32-make -j2 ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinaries update