diff --git a/.travis.yml b/.travis.yml
index 7bfa71c5b..e8490d216 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,14 +28,14 @@ matrix:
                       - gcc-multilib
 
         - os: linux
-          env: BUILD=i686-w64-mingw CXX=i686-w64-mingw32-g++
-          compiler: i686-w64-mingw32-gcc
+          env: 
+              - BUILD=i686-w64-mingw
+              - CONFIGURE_ARGS="--build=i686-unknown-linux-gnu --host=i686-w64-mingw32"
           addons:
               apt:
                   packages:
                       - binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686
 
-
 script:
-    - ./bootstrap && ./configure --enable-remote-bitbang --enable-jtag_vpi && make
+    - ./bootstrap && ./configure --enable-remote-bitbang --enable-jtag_vpi $CONFIGURE_ARGS && make
     - file src/openocd