diff --git a/.travis.yml b/.travis.yml
index 15292352b2..dc53208e09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ sudo: false
 
 matrix:
   include:
+    - rvm: ruby-head
     - rvm: 2.4.0
     - rvm: 2.3.1
     - rvm: 2.2
@@ -18,7 +19,8 @@ matrix:
         - LANG=en_US.UTF-8
         - LANGUAGE=en_US.UTF-8
   allow_failures:
-    - rvm: 2.4.0
+    - rvm: ruby-head
+  fast_finish: true
 
 # whitelist
 branches:
diff --git a/Rakefile b/Rakefile
index af0d076680..bf27e75938 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,7 +11,10 @@ RuboCop::RakeTask.new
 
 task :default => [:spec, :rubocop, :cucumber]
 
-if ENV['TRAVIS']
+# Skip Ruby 2.4 until coveralls supports simplecov (>= 0.13.0)
+# for Ruby 2.4 compatibility.
+# https://rubygems.org/gems/coveralls
+if ENV['TRAVIS'] && RUBY_VERSION < '2.4'
   ENV['SIMPLECOV']  = 'ci'
   ENV['JRUBY_OPTS'] = [ENV['JRUBY_OPTS'], '--debug'].compact.join(' ')