diff --git a/.travis.yml b/.travis.yml
index 049f4033..f6687b8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ env:
   - RIAK_DOWNLOAD_URL=http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.7/ubuntu/trusty/riak_2.0.7-1_amd64.deb
   - RIAK_DOWNLOAD_URL=http://s3.amazonaws.com/downloads.basho.com/riak/2.2/2.2.0/ubuntu/trusty/riak_2.2.0-1_amd64.deb
 before_script:
+  - jdk_switcher use oraclejdk8
   - sudo ./tools/travis-ci/riak-install -d "$RIAK_DOWNLOAD_URL"
   - sudo ./tools/setup-riak
 notifications:
diff --git a/tools b/tools
index 72939314..1fa90702 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit 72939314ab3151db776fcc01c92c26f6ee3dc499
+Subproject commit 1fa9070257c3443f04337e7e37ef083ed7ca2fe4