diff --git a/.travis.yml b/.travis.yml
index 5fdbd8b..f759651 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,21 @@
 language: ruby
 rvm:
-  - rbx-18mode
-  - rbx-19mode
-  - jruby-18mode
-  - jruby-19mode
   - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1
+  - rbx-2
+  - ruby-head
+matrix:
+  include:
+    - rvm: jruby-18mode
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
+    - rvm: jruby-19mode
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
+    - rvm: jruby-head
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: ruby-head
+  fast_finish: true
diff --git a/README.md b/README.md
index 6f7d3eb..d2ee5ef 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ implementations:
 * Ruby 1.9.2
 * Ruby 1.9.3
 * Ruby 2.0.0
+* Ruby 2.1
 * [JRuby](http://jruby.org/)
 * [Rubinius](http://rubini.us/)
 
diff --git a/spec/helper.rb b/spec/helper.rb
index 77a314d..71879fd 100644
--- a/spec/helper.rb
+++ b/spec/helper.rb
@@ -5,7 +5,11 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]
-SimpleCov.start
+
+SimpleCov.start do
+  add_filter '/spec/'
+  minimum_coverage(100)
+end
 
 require 'simple_oauth'
 require 'rspec'