diff --git a/.travis.yml b/.travis.yml
index 86b4354..15c7dad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,45 +20,6 @@ env:
 
 matrix:
   include:
-    - os: linux
-      compiler: gcc-4.8
-      env:
-        - PLATFORM=linux32
-        - CFLAGS="-O3 -DNDEBUG -fPIC -msse2 -m32"
-        - CXXFLAGS="-O3 -DNDEBUG -fPIC -msse2 -m32"
-        - CMAKE=/opt/cmake-3.18.6-Linux-x86_64/bin/cmake
-        - TARGETDIR="linux32"
-        - GM="Unix Makefiles"
-        - MAKE=make
-    - os: linux
-      compiler: gcc-4.8
-      env:
-        - PLATFORM=linux64
-        - CFLAGS="-O3 -DNDEBUG -fPIC"
-        - CXXFLAGS="-O3 -DNDEBUG -fPIC"
-        - CMAKE=/opt/cmake-3.18.6-Linux-x86_64/bin/cmake
-        - TARGETDIR="linux64"
-        - GM="Unix Makefiles"
-        - MAKE=make
-    - os: linux
-      compiler: clang
-      env:
-        - PLATFORM=linux64
-        - CFLAGS="-O3 -DNDEBUG -fPIC"
-        - CXXFLAGS="-O3 -DNDEBUG -fPIC"
-        - CMAKE=/opt/cmake-3.18.6-Linux-x86_64/bin/cmake
-        - TARGETDIR="linux64"
-        - GM="Unix Makefiles"
-        - MAKE=make
-    - os: osx
-      compiler: gcc
-      env:
-        - PLATFORM=darwin64
-        - CC=gcc
-        - CMAKE=cmake
-        - TARGETDIR="darwin64"
-        - GM="Unix Makefiles"
-        - MAKE=make
     - os: windows
       compiler: gcc
       env:
@@ -97,14 +58,15 @@ before_install:
         export msys2+='& set MSYS=winsymlinks:nativestrict '
         export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
         ## 32bit mingw
-        export mingw32="$msys2 -mingw32 -full-path -here -c \$\* --"
+        export mingw32="$msys2 -mingw32 -full-path -here -c "\"\$@"\" --"
         ## 64bit mingw
-        export mingw64="$msys2 -mingw64 -full-path -here -c \$\* --"
-        export msys2+=" -msys2 -c \$\* --"
-        $msys2 pacman --sync --noconfirm --needed autoconf autoconf-archive automake automake-wrapper binutils cmake gettext git libtool m4 make pkg-config mingw-w64-{i686,x86_64}-toolchain mingw-w64-{i686,x86_64}-clang mingw-w64-{i686,x86_64}-make mingw-w64-{i686,x86_64}-cmake mingw-w64-{i686,x86_64}-extra-cmake-modules mingw-w64-{i686,x86_64}-{gcc,binutils} mingw-w64-{i686,x86_64}-hdf5
+        export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
+        export msys2+=" -msys2 -c "\"\$@"\" --"
+        $msys2 pacman --sync --noconfirm --needed mingw-w64-x86_64-toolchain
         ## Install more MSYS2 packages from https://packages.msys2.org/base here
         taskkill //IM gpg-agent.exe //F  # https://travis-ci.community/t/4967
         export PATH=/C/tools/msys64/mingw64/bin:$PATH
+        export MAKE=mingw32-make  # so that Autotools can find it
         ;;
     esac
   - curl https://bitbucket.org/Swyter/bitbucket-curl-upload-to-repo-downloads/raw/default/upload-to-bitbucket.sh -O -J -L