diff --git a/.travis.yml b/.travis.yml
index c494d79..b8b80ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,11 +19,12 @@
 
 # build Apache Thrift on Travis CI - https://travis-ci.org/
 
-language: php
+language: cpp
 
 cache:
  - apt
  - npm
+ - maven
 
 # see what we need: http://thrift.apache.org/docs/install/ubuntu
 before_install:
@@ -34,8 +35,8 @@
 # Java
  - sudo apt-get install -qq ant
 # Ruby
- - gem uninstall bundler -I -x
- - gem install bundler -v 1.3.5
+# - gem uninstall bundler -I -x
+ - gem install bundler -v 1.3.5 || true
 # Python
 # - sudo apt-get install -qq python-all python-all-dev python-all-dbg
 # Perl
@@ -71,7 +72,7 @@
 # TODO: fix these languages
   - sh configure --without-erlang --without-haskell --without-python
   - make -j$NUM_CPU && make dist
-  - make check -j$NUM_CPU && sh test/test.sh
+  - make cross -j$NUM_CPU
   - sh bootstrap.sh ; sh contrib/mingw-cross-compile.sh
 # TODO: add these steps
 #  - sh bootstrap.sh ; dpkg-buildpackage -tc