diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index cd4190ea9..cefc06fe9 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -46,7 +46,7 @@ run_cmd() {
 			else
 				7z a output.7z output.log > /dev/null 2>&1
 
-				appveyor PushArtifact output.7z -DeploymentName $CMD-output.7z
+				appveyor PushArtifact output.7z -FileName $CMD-output.7z
 				appveyor AddMessage "Command $CMD failed (code $RET), output has been pushed as an artifact." -Category Error
 			fi
 		else
@@ -90,10 +90,6 @@ real_pwd() {
 	pwd | sed "s,/\(.\),\1:,"
 }
 
-msbuild() {
-	/c/Program\ Files\ \(x86\)/MSBuild/12.0/Bin/MSBuild.exe $@
-}
-
 CMAKE_OPTS=""
 add_cmake_opts() {
 	CMAKE_OPTS="$CMAKE_OPTS $@"
diff --git a/CI/build.msvc.sh b/CI/build.msvc.sh
index 57f4f6c1d..b17e7b94c 100644
--- a/CI/build.msvc.sh
+++ b/CI/build.msvc.sh
@@ -33,4 +33,11 @@ fi
 
 cd build_$BITS
 
+which msbuild > /dev/null
+if [ $? -ne 0 ]; then
+	msbuild() {
+		/c/Program\ Files\ \(x86\)/MSBuild/12.0/Bin/MSBuild.exe "$@"
+	}
+fi
+
 msbuild OpenMW.sln //t:Build //p:Configuration=$CONFIGURATION //m:8 //logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"