diff --git a/.travis.yml b/.travis.yml
index 9434934..9efe0cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
   - 2.1
-  - jruby-19mode
+  - 2.4
+  - jruby-9.1.9.0
 before_script:
   - phantomjs --version
 env:
@@ -16,6 +15,7 @@ gemfile:
   - gemfiles/opal_0.9_react_14.gemfile
   - gemfiles/opal_0.9_react_15.gemfile
 cache:
+  bundler: true
   directories:
     - "travis_phantomjs"
 branches:
@@ -26,7 +26,7 @@ before_install:
   - "export PATH=$PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin:$PATH"
   - "phantomjs --version"
   - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
-  - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then wget https://github.com/Medium/phantomjs/releases/download/v$PHANTOMJS_VERSION/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2; fi"
+  - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2; fi"
   - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
   - "phantomjs --version"
   - gem install bundler -v 1.13.7
@@ -36,12 +36,13 @@ script:
 # These two setup seems to run indefinitely long
 # further investigation required.
 matrix:
+  fast_finish: true
   exclude:
-  - rvm: jruby-19mode
+  - rvm: jruby-9.1.9.0
     gemfile: gemfiles/opal_0.9_react_13.gemfile
-  - rvm: jruby-19mode
+  - rvm: jruby-9.1.9.0
     gemfile: gemfiles/opal_0.9_react_14.gemfile
-  - rvm: jruby-19mode
+  - rvm: jruby-9.1.9.0
     gemfile: gemfiles/opal_0.9_react_15.gemfile
   include:
   - rvm: 2.1