diff --git a/.travis.yml b/.travis.yml
index 152a491..a847ae7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,30 +4,28 @@ sudo: false
 matrix:
   include:
     - os: linux
-      compiler: gcc-4.8
+      compiler: g++
       script:
-        - CXXFLAGS="-mno-rtm" cmake -DCMAKE_CXX_COMPILER=g++-4.8 .
-        - make -j2
+        - cmake -DCMAKE_INSTALL_PREFIX=~/.local .
+        - make install -j2
         - ctest -j2 --output-on-failure --timeout 500
       addons:
         apt:
           packages:
-            - g++-4.8
-            - g++-4.8-multilib
-            - g++-multilib
+            - g++
             - cmake
             - swig
             - python-dev
     - os: osx
       compiler: clang
       script:
-        - cmake .
-        - make -j2
+        - cmake -DCMAKE_INSTALL_PREFIX=~/.local .
+        - make install -j2
         - ctest -j2 --output-on-failure --timeout 500 -E parallel_for
     - os: linux
       compiler: x86_64-w64-mingw32-g++
       script:
-        - cmake -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DCMAKE_TOOLCHAIN_FILE=build/mingw_cross_toolchain.cmake -DGNU_HOST=x86_64-w64-mingw32 .
+        - cmake -DCMAKE_TOOLCHAIN_FILE=build/mingw_cross_toolchain.cmake .
         - make -j2
       addons:
         apt:
@@ -37,16 +35,3 @@ matrix:
             - binutils-mingw-w64-x86-64
             - cmake
             - make
-    - os: linux
-      compiler: i686-w64-mingw32-g++
-      script:
-        - cmake -DCMAKE_CXX_COMPILER=i686-w64-mingw32-g++ -DCMAKE_TOOLCHAIN_FILE=build/mingw_cross_toolchain.cmake -DGNU_HOST=i686-w64-mingw32 .
-        - make -j2
-      addons:
-        apt:
-          packages:
-            - g++-mingw-w64-i686
-            - gcc-mingw-w64-i686
-            - binutils-mingw-w64-i686
-            - cmake
-            - make
diff --git a/build/mingw_cross_toolchain.cmake b/build/mingw_cross_toolchain.cmake
index f2183fa..7ebefa6 100644
--- a/build/mingw_cross_toolchain.cmake
+++ b/build/mingw_cross_toolchain.cmake
@@ -1,9 +1,8 @@
 # CMake toolchain file, cf. README.mingw_cross
 SET(CMAKE_SYSTEM_NAME Windows)
-include(CMakeForceCompiler)
 IF("${GNU_HOST}" STREQUAL "")
-   SET(GNU_HOST i586-mingw32msvc)
+   SET(GNU_HOST x86_64-w64-mingw32)
 ENDIF()
-# Prefix detection only works with compiler id "GNU"
-CMAKE_FORCE_C_COMPILER(${GNU_HOST}-gcc GNU)
-SET(CMAKE_RC_COMPILER ${GNU_HOST}-windres)
\ No newline at end of file
+SET(CMAKE_C_COMPILER ${GNU_HOST}-gcc)
+SET(CMAKE_CXX_COMPILER ${GNU_HOST}-g++)
+SET(CMAKE_RC_COMPILER ${GNU_HOST}-windres)