diff --git a/.travis.yml b/.travis.yml
index 547670a..0867b48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,37 @@ language: java
 os:
   - linux
   - osx
-#jdk:
-#  - oraclejdk8
+
 branches:
   except:
     - /.*test$/
+
+env:
+  matrix:
+    - CUSTOM_JDK="default"
+    - CUSTOM_JDK="oraclejdk8"
+    - CUSTOM_JDK="oraclejdk7"
+    - CUSTOM_JDK="openjdk7"
+
+matrix:
+  exclude:
+     # On OSX, run with default JDK only.
+     - os: osx
+       env: CUSTOM_JDK="oraclejdk8"
+     - os: osx
+       env: CUSTOM_JDK="oraclejdk7"
+     - os: osx
+       env: CUSTOM_JDK="openjdk7"
+     # On Linux, run with specific JDKs only.
+     - os: linux
+       env: CUSTOM_JDK="default"
+
+before_install:
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_home); fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then jdk_switcher use "$CUSTOM_JDK"; fi
+
 before_script: sudo apt-get install build-essential automake1.10 libtool
+
 script: "mvn install -P linux64"
 
 after_success: