diff --git a/appveyor.yml b/appveyor.yml
index b3e4c313b949d8..d02d0434916adc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -38,7 +38,7 @@ after_build:
   - 7z a ..\gvim_%ARCH%.zip ..\runtime\*
 
 test_script:
-  - path %path%;C:\Lua;C:\Perl522\bin;C:\Tcl\bin
+  - path %path%;C:\Lua;C:\Perl522\perl\bin;C:\Tcl\bin
   - cd testdir
   - nmake -f Make_dos.mak VIMPROG=..\gvim
   - nmake -f Make_dos.mak VIMPROG=..\vim
diff --git a/src/appveyor.bat b/src/appveyor.bat
index 1a619cf2f32677..da0b2ea4ac73b4 100755
--- a/src/appveyor.bat
+++ b/src/appveyor.bat
@@ -20,10 +20,11 @@ reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7
 curl -L "http://downloads.sourceforge.net/project/luabinaries/5.3.2/Windows%%20Libraries/Dynamic/lua-5.3.2_Win32_dllw4_lib.zip" -o lua.zip
 7z x lua.zip -oC:\Lua
 :: Perl
-appveyor DownloadFile http://downloads.activestate.com/ActivePerl/releases/5.22.0.2200/ActivePerl-5.22.0.2200-MSWin32-x86-64int-299195.msi -F perl.msi
-msiexec /i /quiet perl.msi TARGETDIR=C:\Perl522
+appveyor DownloadFile http://downloads.activestate.com/ActivePerl/releases/5.22.0.2200/ActivePerl-5.22.0.2200-MSWin32-x86-64int-299195.zip -FileName perl.zip
+7z x perl.zip -oC:\
+for %%i in (C:\ActivePerl*) do move %%i C:\Perl522
 :: Tcl
-appveyor DownloadFile http://downloads.activestate.com/ActiveTcl/releases/8.6.4.1/ActiveTcl8.6.4.1.299124-win32-ix86-threaded.exe -F tcl.exe
+appveyor DownloadFile http://downloads.activestate.com/ActiveTcl/releases/8.6.4.1/ActiveTcl8.6.4.1.299124-win32-ix86-threaded.exe -FileName tcl.exe
 start /wait tcl.exe --directory C:\Tcl
 
 @echo off
@@ -38,10 +39,11 @@ reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7
 curl -L "http://downloads.sourceforge.net/project/luabinaries/5.3.2/Windows%%20Libraries/Dynamic/lua-5.3.2_Win64_dllw4_lib.zip" -o lua.zip
 7z x lua.zip -oC:\Lua
 :: Perl
-appveyor DownloadFile http://downloads.activestate.com/ActivePerl/releases/5.22.0.2200/ActivePerl-5.22.0.2200-MSWin32-x64-299195.msi -F perl.msi
-msiexec /i /quiet perl.msi TARGETDIR=C:\Perl522
+appveyor DownloadFile http://downloads.activestate.com/ActivePerl/releases/5.22.0.2200/ActivePerl-5.22.0.2200-MSWin32-x64-299195.zip -FileName perl.zip
+7z x perl.zip -oC:\
+for %%i in (C:\ActivePerl*) do move %%i C:\Perl522
 :: Tcl
-appveyor DownloadFile http://downloads.activestate.com/ActiveTcl/releases/8.6.4.1/ActiveTcl8.6.4.1.299124-win32-x86_64-threaded.exe -F tcl.exe
+appveyor DownloadFile http://downloads.activestate.com/ActiveTcl/releases/8.6.4.1/ActiveTcl8.6.4.1.299124-win32-x86_64-threaded.exe -FileName tcl.exe
 start /wait tcl.exe --directory C:\Tcl
 
 @echo off
@@ -57,7 +59,7 @@ sed -e "s/\$(LINKARGS2)/\$(LINKARGS2) | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak >
 nmake -f Make_mvc2.mak CPU=i386 ^
 	GUI=yes OLE=no DIRECTX=yes ^
 	FEATURES=HUGE IME=yes MBYTE=yes ICONV=yes DEBUG=no ^
-	PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522 ^
+	PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522\perl ^
 	PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27 ^
 	PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34 ^
 	LUA_VER=53 DYNAMIC_LUA=yes LUA=C:\Lua ^
@@ -67,7 +69,7 @@ nmake -f Make_mvc2.mak CPU=i386 ^
 nmake -f Make_mvc2.mak CPU=i386 ^
 	GUI=no OLE=no DIRECTX=no ^
 	FEATURES=HUGE IME=yes MBYTE=yes ICONV=yes DEBUG=no ^
-	PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522 ^
+	PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522\perl ^
 	PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27 ^
 	PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34 ^
 	LUA_VER=53 DYNAMIC_LUA=yes LUA=C:\Lua ^
@@ -91,7 +93,7 @@ sed -e "s/\$(LINKARGS2)/\$(LINKARGS2) | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak >
 nmake -f Make_mvc2.mak CPU=AMD64 ^
 	GUI=yes OLE=no DIRECTX=yes ^
 	FEATURES=HUGE IME=yes MBYTE=yes ICONV=yes DEBUG=no ^
-	PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522 ^
+	PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522\perl ^
 	PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
 	PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34-x64 ^
 	LUA_VER=53 DYNAMIC_LUA=yes LUA=C:\Lua ^
@@ -101,7 +103,7 @@ nmake -f Make_mvc2.mak CPU=AMD64 ^
 nmake -f Make_mvc2.mak CPU=AMD64 ^
 	GUI=no OLE=no DIRECTX=no ^
 	FEATURES=HUGE IME=yes MBYTE=yes ICONV=yes DEBUG=no ^
-	PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522 ^
+	PERL_VER=522 DYNAMIC_PERL=yes PERL=C:\Perl522\perl ^
 	PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
 	PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34-x64 ^
 	LUA_VER=53 DYNAMIC_LUA=yes LUA=C:\Lua ^