diff --git a/.travis.yml b/.travis.yml
index dc850840a..8341235e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,14 @@ branches:
   - master
   - v3.1
 
+matrix:
+  include:
+  - jdk: openjdk8
+    os: linux
+    env: UPLOAD_ALL=true
+  - jdk: openjdk7
+    os: linux
+  - os: osx
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -16,6 +24,11 @@ cache:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 
+before_script:
+  - 'echo "Tag: $TRAVIS_TAG"'
+  - 'echo "OS: $TRAVIS_OS_NAME"'
+  - 'echo "PR: $TRAVIS_PULL_REQUEST"'
+
 notifications:
   slack:
     on_success: change