diff --git a/.travis.yml b/.travis.yml
index 1ecb368..df4624c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,15 +7,16 @@ before_install:
   - gem cleanup bundler
 cache: bundler
 rvm:
-  - 2.1.5
-  - 2.2.4
-  - 2.3.0
-  - jruby-19mode
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
 branches:
   only:
     - master
 install:
-  - "travis_retry bundle install --jobs 8"
+  - "bundle install --retry 3 --jobs 8"
 gemfile:
   - gemfiles/rails3.2.gemfile
   - gemfiles/rails4.1.gemfile
@@ -24,7 +25,12 @@ gemfile:
 matrix:
   fast_finish: true
   allow_failures:
-    - rvm: jruby-19mode
-      gemfile: gemfiles/rails5.0.gemfile
-    - rvm: 2.1.5
+    - rvm: 2.1
       gemfile: gemfiles/rails5.0.gemfile
+    # Ruby 2.4+ doesn't work with ActiveSupport 4.1
+    # https://github.com/rails/rails/pull/25161
+    # https://github.com/rails/rails/pull/25737
+    - rvm: 2.4
+      gemfile: gemfiles/rails4.1.gemfile
+    - rvm: 2.5
+      gemfile: gemfiles/rails4.1.gemfile