diff --git a/.appveyor.sh b/.appveyor.sh
deleted file mode 100755
index 5712826..0000000
--- a/.appveyor.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-set -x
-cd "${APPVEYOR_BUILD_FOLDER}" || exit 1
-git submodule update --init --recursive
-mkdir -p build
-cd build || exit 1
-export PATH="/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/WINDOWS/system32:/c/WINDOWS:/c/WINDOWS/System32/Wbem:/c/WINDOWS/System32/WindowsPowerShell/v1.0:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl"
-exec bash -c "set -x && cmake -G\"MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=/mingw64 -DBUILD_TESTING=1 .. && make && make test"
-
diff --git a/.appveyor.yml b/.appveyor.yml
index b4d5ba9..36f2bef 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,10 +6,10 @@ environment:
   CTEST_OUTPUT_ON_FAILURE: 1
 
 before_build:
-  - C:\msys64\usr\bin\pacman --noconfirm --ask 20 --sync --refresh --sysupgrade
-  - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh pacman
-  - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh git
-  - C:\msys64\usr\bin\pacman --noconfirm --needed --sync mingw-w64-x86_64-cmake make mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang mingw-w64-x86_64-gtkmm3 mingw-w64-x86_64-gtksourceviewmm3 mingw-w64-x86_64-boost mingw-w64-x86_64-aspell mingw-w64-x86_64-aspell-en mingw-w64-x86_64-libgit2
+  - git submodule update --init --recursive
+#  - C:\msys64\usr\bin\bash -lc "PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:$PATH && pacman --noconfirm --ask 20 --sync --refresh --sysupgrade"
+#  - C:\msys64\usr\bin\bash -lc "PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:$PATH && pacman --noconfirm --sync --refresh pacman git"
+  - C:\msys64\usr\bin\bash -lc "PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:$PATH && pacman --noconfirm --needed --sync make mingw-w64-x86_64-{cmake,toolchain,clang,gtkmm3,gtksourceviewmm3,boost,aspell,aspell-en,libgit2}"
 
 build_script:
-  - C:\msys64\usr\bin\bash -lc "$(cygpath ${APPVEYOR_BUILD_FOLDER})/.appveyor.sh"
+  - C:\msys64\usr\bin\bash -lc "PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:$PATH && cd $APPVEYOR_BUILD_FOLDER && mkdir build && cd build && cmake -G\"MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=/mingw64 -DBUILD_TESTING=1 .. && make && make test"