diff --git a/.travis.yml b/.travis.yml
index 8a6eba4bf10af61acec122523329f1ebdf30f6e6..d0219381d1385466159adb1f469f6ecf5fb4ebcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.2
+  - 2.2.0
   - jruby-19mode
   - rbx-2
 gemfile:
diff --git a/Gemfile b/Gemfile
index 4c32d70a49f1fa3f96066a420dba491dcbcf5828..1736f439247353fd17c6a296f995ebf30960a73b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,7 @@ group :development, :test do
   gem 'geoip'
   gem 'rubyzip'
   gem 'rails'
+  gem 'test-unit' # needed for Ruby >=2.2.0
 
   # i18n gem >=0.7.0 does not work with Ruby 1.9.2
   gem 'i18n', '0.6.1', :platforms => [:mri_19]