diff --git a/.travis.yml b/.travis.yml
index 0877e0e..9dee5b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,25 @@
+language: ruby
+
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - jruby
-  - rbx
-  - ree
+  - 2.0.0
+  - 2.1
+  - 2.2
+  - jruby-19mode
+  - jruby-head
+  - rbx-2
   - ruby-head
+
+sudo: false
+
+bundler_args: --without development --retry=3 --jobs=3
+
+env:
+  global:
+    - JRUBY_OPTS="$JRUBY_OPTS --debug"
+
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: rbx-2
+    - rvm: ruby-head
+  fast_finish: true