diff --git a/.travis.yml b/.travis.yml
index c4f992c..b715a8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,15 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.0
   - 2.1
+  - 2.2
+  - 2.3
+  - 2.4.0
   - ruby-head
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-2
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: rbx-2
 bundler_args: --without local_development
diff --git a/Gemfile b/Gemfile
index 64a2990..188f4e8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,11 +4,13 @@ source 'https://rubygems.org'
 gemspec
 
 if ENV['TRAVIS']
-  gem 'roo', '>= 2.0.0beta1', github: 'roo-rb/roo'
+  gem 'roo', '>= 2.0.0beta1', git: 'https://github.com/roo-rb/roo.git'
 else
   gem 'roo', '>= 2.0.0beta1', path: ::File.expand_path('../../roo', __FILE__)
 end
 
+gem 'activesupport', '~> 4.2.0' if RUBY_VERSION < '2.2'
+
 group :test do
   # additional testing libs
   gem 'webmock'
diff --git a/roo-xls.gemspec b/roo-xls.gemspec
index 6b5bf38..40f3d11 100644
--- a/roo-xls.gemspec
+++ b/roo-xls.gemspec
@@ -19,9 +19,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "roo", ">= 2.0.0beta1", "< 3"
-  spec.add_dependency "nokogiri"
   spec.add_dependency "spreadsheet", "> 0.9.0"
 
+  if RUBY_VERSION >= '2.1'
+    spec.add_dependency "nokogiri"
+  else
+    spec.add_dependency "nokogiri", "~> 1.6.0"
+  end
+
   spec.add_development_dependency "bundler", ">= 1.7"
   spec.add_development_dependency "rake", ">= 10.0"
 end