diff --git a/.travis.yml b/.travis.yml
index d7c709b..9bcae0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,17 @@ bundler_args: --without doc
 rvm:
   - 1.8.7
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
+  - rbx
+  - rbx-2
+  - jruby
   - ruby-head
-  - jruby-19mode
   - jruby-head
-  - rbx
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
 notifications:
   email:
     - github@elskwid.net