diff --git a/appveyor.yml b/appveyor.yml
index 76f0181f..37ec979c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,6 +5,7 @@ environment:
   global:
     AUTH_TOKEN:
       secure: rKd6JLXUIl3vcA8d0S9w14bl+uvUlZLt0d1M8bmlOh+owQqr5c40+/4ITCNBpHG3
+    VIMVER: 80
   matrix:
   - COMPILER: msvc
     CPU: i386
@@ -15,7 +16,12 @@ environment:
     ENV: /x64
     BIT: 64
   - COMPILER: cygwin
-  - COMPILER: mingw
+  #- COMPILER: mingw
+  #  BIT: 32
+  - COMPILER: msys2
+    MSYS2_ARCH: i686
+    MSYS2_DIR: msys64
+    MSYSTEM: MINGW32
     BIT: 32
   - COMPILER: msys2
     MSYS2_ARCH: x86_64
diff --git a/tools/appveyor.bat b/tools/appveyor.bat
index 209ee3d5..60940c6d 100755
--- a/tools/appveyor.bat
+++ b/tools/appveyor.bat
@@ -27,7 +27,7 @@ nmake -f make_msvc.mak nodebug=1 CPU=%CPU%
 goto :eof
 
 :msvc_test
-set THEMIS_VIM=%APPVEYOR_BUILD_FOLDER%\vim74-kaoriya-win%BIT%\vim.exe
+set THEMIS_VIM=%APPVEYOR_BUILD_FOLDER%\vim%VIMVER%-kaoriya-win%BIT%\vim.exe
 @echo on
 themis\bin\themis
 
@@ -47,7 +47,7 @@ make -f make_mingw32.mak
 goto :eof
 
 :mingw_test
-set THEMIS_VIM=%APPVEYOR_BUILD_FOLDER%\vim74-kaoriya-win%BIT%\vim.exe
+set THEMIS_VIM=%APPVEYOR_BUILD_FOLDER%\vim%VIMVER%-kaoriya-win%BIT%\vim.exe
 @echo on
 themis\bin\themis
 
@@ -72,7 +72,7 @@ bash -lc "make"
 goto :eof
 
 :msys2_test
-set THEMIS_VIM=%APPVEYOR_BUILD_FOLDER%\vim74-kaoriya-win%BIT%\vim.exe
+set THEMIS_VIM=%APPVEYOR_BUILD_FOLDER%\vim%VIMVER%-kaoriya-win%BIT%\vim.exe
 @echo on
 themis\bin\themis