diff --git a/.travis.yml b/.travis.yml
index 6d7dd21..b778b6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,21 @@
+sudo: false
 language: ruby
+cache: bundler
 rvm:
   - 1.8.7
   - ree
   - 1.9.3
   - 2.0.0
+  - 2.1
+  - 2.2
+  - 2.3.0
   - ruby-head
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-head
-  - rbx-18mode
-  - rbx-19mode
+  - jruby-1.7
+  - jruby-9
+  - rbx-2
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-18mode
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode
+    - rvm: rbx-2
+before_install:
+  - gem update bundler
diff --git a/http-cookie.gemspec b/http-cookie.gemspec
index b655d86..02cdfd0 100644
--- a/http-cookie.gemspec
+++ b/http-cookie.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency("domain_name", ["~> 0.5"])
   gem.add_development_dependency("sqlite3", ["~> 1.3.3"]) unless defined?(JRUBY_VERSION)
   gem.add_development_dependency("bundler", [">= 1.2.0"])
-  gem.add_development_dependency("test-unit", [">= 2.4.3"])
+  gem.add_development_dependency("test-unit", [">= 2.4.3", *("< 3" if RUBY_VERSION < "1.9")])
   gem.add_development_dependency("rake", [">= 0.9.2.2", *("< 11" if RUBY_VERSION < "1.9")])
   gem.add_development_dependency("rdoc", ["> 2.4.2"])
   gem.add_development_dependency("simplecov", [">= 0"])