diff --git a/CHANGELOG b/CHANGELOG
index 95f56145d65..95b43434f18 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@
 * Barclays ePDQ: Handle incorrectly encoded response [jordanwheeler, aprofeit]
 * Orbital: Bug fixes; add CustomerEmail, Retry Logic, Managed Billing, and Destination Address [juicedM3
 * Distinguish invalid vs empty issue_numbers on CreditCards [drasch]
+* Float Gemfiles to latest Rails [sanemat]
 
 == Version 1.32.1 (April 4, 2013)
 
diff --git a/Gemfile b/Gemfile
index 3520e4099a2..afaf4e85470 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'activesupport', '3.2.8'
-gem 'rails', '3.2.8'
+gem 'activesupport', '>= 3.2.8', '< 4'
+gem 'rails', '>= 3.2.8', '< 4'
 
 eval File.read(File.expand_path("../Gemfile_common", __FILE__))
diff --git a/Gemfile_rails23 b/Gemfile_rails23
index a1e8e9982f8..259b7182b92 100644
--- a/Gemfile_rails23
+++ b/Gemfile_rails23
@@ -1,10 +1,13 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
-gem 'activesupport', '2.3.14'
-gem 'rails', '2.3.14'
+gem 'activesupport', '>= 2.3.14', '< 3'
+gem 'rails', '>= 2.3.14', '< 3'
 platforms :mri_20 do
   gem 'iconv'
 end
+if RUBY_VERSION < '1.9'
+  gem 'mocha', '~> 0.11.0', :require => false
+end
 
 eval File.read(File.expand_path("../Gemfile_common", __FILE__))
diff --git a/Gemfile_rails30 b/Gemfile_rails30
index ee575958c42..3e6d1d4ae32 100644
--- a/Gemfile_rails30
+++ b/Gemfile_rails30
@@ -1,7 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
-gem 'activesupport', '3.0.17'
-gem 'rails', '3.0.17'
+gem 'activesupport', '>= 3.0.17', '< 3.1'
+gem 'rails', '>= 3.0.17', '< 3.1'
 
 eval File.read(File.expand_path("../Gemfile_common", __FILE__))
diff --git a/Gemfile_rails31 b/Gemfile_rails31
index ff40b48e144..cf052fdbb66 100644
--- a/Gemfile_rails31
+++ b/Gemfile_rails31
@@ -1,7 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
-gem 'activesupport', '3.1.8'
-gem 'rails', '3.1.8'
+gem 'activesupport', '>= 3.1.8', '< 3.2'
+gem 'rails', '>= 3.1.8', '< 3.2'
 
 eval File.read(File.expand_path("../Gemfile_common", __FILE__))
diff --git a/activemerchant.gemspec b/activemerchant.gemspec
index 29fe4f63493..eb70026d956 100644
--- a/activemerchant.gemspec
+++ b/activemerchant.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency('nokogiri')
 
   s.add_development_dependency('rake')
-  s.add_development_dependency('mocha', '~> 0.11.3')
+  s.add_development_dependency('mocha', '~> 0.13.0')
   s.add_development_dependency('rails', '>= 2.3.14')
   s.add_development_dependency('thor')
   s.signing_key = ENV['GEM_PRIVATE_KEY']
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 5da19cf6784..ed3263b291f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -11,7 +11,12 @@
 
 require 'test/unit'
 require 'money'
-require 'mocha'
+require 'mocha/version'
+if(Mocha::VERSION.split(".")[1].to_i < 12)
+  require 'mocha'
+else
+  require 'mocha/setup'
+end
 require 'yaml'
 require 'json'
 require 'active_merchant'