diff --git a/.travis.yml b/.travis.yml
index 78205c848..abdb54327 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,51 @@
 language: cpp
 compiler:
-  - gcc
   - clang
+  - gcc
+env:
+  - SWIGLANG=
 matrix:
   include:
-    - python: "2.7"
-      compiler: gcc
+    - compiler: gcc
+      env: SWIGLANG=csharp
+    - compiler: gcc
+      env: SWIGLANG=go
+    - compiler: gcc
+      env: SWIGLANG=java
+    - compiler: gcc
+      env: SWIGLANG=lua
+    - compiler: gcc
+      env: SWIGLANG=octave SWIGJOBS=-j4
+    - compiler: gcc
+      env: SWIGLANG=perl5
+    - compiler: gcc
+      env: SWIGLANG=php
+    - compiler: gcc
       env: SWIGLANG=python
-    - jdk: oraclejdk6
-      compiler: gcc
-      env: SWIGLANG=java
-    - jdk: oraclejdk7
-      compiler: gcc
-      env: SWIGLANG=java
-    - perl: "5.10"
-      compiler: gcc
-      env: SWIGLANG=perl
-    - rvm: 1.8.7
-      compiler: gcc
+    - compiler: gcc
       env: SWIGLANG=ruby
+    - compiler: gcc
+      env: SWIGLANG=tcl
+  allow_failures:
+      # None
 before_install:
-  - sudo apt-get install libboost-dev -qq
+  - lsb_release -a
+  - uname -a
+  - time sudo apt-get -qq install libboost-dev
+  - if test "$SWIGLANG" = "csharp"; then sudo apt-get -qq install mono-devel; fi
+  - if test "$SWIGLANG" = "go"; then go env | sed -e 's/^/export /' > goenvsetup && source goenvsetup && rm -f goenvsetup; fi # Until configure.ac is fixed
+  - if test "$SWIGLANG" = "lua"; then sudo apt-get -qq install lua5.1 liblua5.1-dev; fi
+  - if test "$SWIGLANG" = "octave"; then sudo apt-get -qq install octave3.2 octave3.2-headers; fi
+  - if test "$SWIGLANG" = "php"; then sudo apt-get install php5-cli php5-dev; fi
+  - if test "$SWIGLANG" = "tcl"; then sudo apt-get -qq install tcl8.4-dev; fi
 script:
   - ./autogen.sh && ./configure
-  - make -s
-  - echo "SWIGLANG: $SWIGLANG"
-#  - make -k check-$SWIGLANG-examples check-$SWIGLANG-test-suite
+  - make -s $SWIGJOBS
+  - if test -z "$SWIGLANG"; then make -s check-ccache; fi
+  - ./swig -version
+  - if test -n "$SWIGLANG"; then make -s check-$SWIGLANG-version; fi
+  - if test -n "$SWIGLANG"; then make -k $SWIGJOBS check-$SWIGLANG-examples; fi
+  - if test -n "$SWIGLANG"; then make -k $SWIGJOBS check-$SWIGLANG-test-suite; fi
 branches:
   only:
     - master