diff --git a/Gemfile b/Gemfile
index 17520b8c2..be64e529d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,8 +2,12 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'activesupport', '>= 2.3.6' if RUBY_VERSION >= '1.9.3'
-gem 'activesupport', '>= 2.3.6', '< 4.0.0' if RUBY_VERSION < '1.9.3'
+if RUBY_VERSION < '1.9.3'
+  gem 'activesupport', '< 4'
+elsif RUBY_VERSION < '2.2.2'
+  gem 'activesupport', '< 5'
+end
+gem 'i18n', '< 0.7.0' if RUBY_VERSION < '1.9.3'
 gem "tlsmail" if RUBY_VERSION <= '1.8.6'
 gem "mime-types", "~> 1.16"
 gem "treetop", "~> 1.4.10"
@@ -12,9 +16,8 @@ gem 'jruby-openssl', :platform => :jruby
 
 # For gems not required to run tests
 group :local_development, :test do
-  gem 'rake', '> 0.8.7' if RUBY_VERSION >= '1.9.3'
-  gem 'rake', '> 0.8.7', '< 11.0.1' if RUBY_VERSION < '1.9.3'
-  gem 'rdoc', '< 5' if RUBY_VERSION < '1.9'
+  gem 'rake', '> 0.8.7', '< 11.0.1'
+  gem 'rdoc', '< 4.3' if RUBY_VERSION < '1.9'
   gem "rspec",      "~> 2.8.0"
   case
   when defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'