diff --git a/package/ci/appveyor-desktop-mingw.bat b/package/ci/appveyor-desktop-mingw.bat
index dd3fc9445..f99a84e52 100644
--- a/package/ci/appveyor-desktop-mingw.bat
+++ b/package/ci/appveyor-desktop-mingw.bat
@@ -1,8 +1,8 @@
 rem Workaround for CMake not wanting sh.exe on PATH for MinGW. AARGH.
 set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
-set PATH=C:\tools\mingw64\bin;%APPVEYOR_BUILD_FOLDER%/openal/bin/Win64;%APPVEYOR_BUILD_FOLDER%\deps\bin;%PATH%
+set PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%APPVEYOR_BUILD_FOLDER%/openal/bin/Win64;%APPVEYOR_BUILD_FOLDER%\deps\bin;%PATH%
 
-rem Build Corrade. Could not get Ninja to work, meh.
+rem Build Corrade
 git clone --depth 1 git://github.com/mosra/corrade.git || exit /b
 cd corrade || exit /b
 mkdir build && cd build || exit /b
@@ -10,9 +10,9 @@ cmake .. ^
     -DCMAKE_BUILD_TYPE=Release ^
     -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
     -DWITH_INTERCONNECT=OFF ^
-    -G "MinGW Makefiles" || exit /b
-cmake --build . -- -j || exit /b
-cmake --build . --target install -- -j || exit /b
+    -G Ninja || exit /b
+cmake --build . || exit /b
+cmake --build . --target install || exit /b
 cd .. && cd ..
 
 rem Build
@@ -39,9 +39,9 @@ cmake .. ^
     -DWITH_AL_INFO=ON ^
     -DBUILD_TESTS=ON ^
     -DBUILD_GL_TESTS=ON ^
-    -G "MinGW Makefiles" || exit /b
-cmake --build . -- -j || exit /b
-cmake --build . --target install -- -j || exit /b
+    -G Ninja || exit /b
+cmake --build . || exit /b
+cmake --build . --target install || exit /b
 
 rem Test
 ctest -V -E GLTest || exit /b
diff --git a/package/ci/appveyor.yml b/package/ci/appveyor.yml
index 9dd065c9b..2a1303e53 100644
--- a/package/ci/appveyor.yml
+++ b/package/ci/appveyor.yml
@@ -14,7 +14,7 @@ environment:
     APPVEYOR_JOB_NAME: windows-desktop-msvc2017
   - TARGET: desktop
     COMPILER: mingw
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     APPVEYOR_JOB_NAME: windows-desktop-mingw
   - TARGET: desktop-gles
     TARGET_GLES2: ON
@@ -59,12 +59,6 @@ notifications:
 install:
 - cinst ninja
 - set PATH=C:/tools/ninja;%PATH%
-# `cinst mingw` fails with 404 since Dec 2016, `appveyor Downloadfile` fails
-# with "Message string length exceeds 32k characters" so I have to call a
-# fucking powershell command in order to download a file. Oh and %20 in the URL
-# somehow gives a 404 ALSO so I have to explicitly use spaces. WHAT THE FUCK!
-- IF "%TARGET%" == "desktop" IF "%COMPILER%" == "mingw" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\x86_64-6.3.0-release-posix-seh-rt_v5-rev1.7z powershell -Command "(new-object System.Net.WebClient).Downloadfile('https://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win64/Personal Builds/mingw-builds/6.3.0/threads-posix/seh/x86_64-6.3.0-release-posix-seh-rt_v5-rev1.7z', 'x86_64-6.3.0-release-posix-seh-rt_v5-rev1.7z')"
-- IF "%TARGET%" == "desktop" IF "%COMPILER%" == "mingw" cd C:\tools && 7z x %APPVEYOR_BUILD_FOLDER%\x86_64-6.3.0-release-posix-seh-rt_v5-rev1.7z && cd %APPVEYOR_BUILD_FOLDER%
 
 # OpenAL
 - IF NOT "%TARGET%" == "rt" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\openal-soft-1.17.2-bin.zip appveyor DownloadFile http://kcat.strangesoft.net/openal-binaries/openal-soft-1.17.2-bin.zip
@@ -94,5 +88,4 @@ cache:
 - SDL2-devel-2.0.4-VC.zip
 - SDL2-devel-2.0.4-mingw.zip
 - openal-soft-1.17.2-bin.zip
-- x86_64-6.3.0-release-posix-seh-rt_v5-rev1.7z
 - glfw-3.2.1.bin.WIN64.zip