3 files changed, 3 insertions, 3 deletions
diff --git a/common_dependencies.rb b/common_dependencies.rb
index 5312a80..7542b1b 100644
--- a/common_dependencies.rb
+++ b/common_dependencies.rb
@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
 group :test do
-  gem 'mocha', :require => false
+  gem 'mocha', :require => false, :version => '~> 0.13.0'
 end
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 50d5159..0016771 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,7 +2,7 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 
-require 'mocha'
+require 'mocha/setup'
 
 # Load support files from all engines
 Dir["#{File.dirname(__FILE__)}/../*/test/support/**/*.rb"].each { |f| require f }
diff --git a/users/test/test_helper.rb b/users/test/test_helper.rb
index e8f0125..52dff53 100644
--- a/users/test/test_helper.rb
+++ b/users/test/test_helper.rb
@@ -1,7 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../../test/dummy/config/environment', __FILE__)
 require 'rails/test_help'
-require 'mocha'
+require 'mocha/setup'
 
 Rails.backtrace_cleaner.remove_silencers!