diff --git a/Gemfile b/Gemfile
index b9b3a4cb23..c3f9e6ed9e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gemspec
 
 gem 'arel', github: 'rails/arel', branch: 'master'
 
-gem 'mocha', '>= 0.11.2', require: false
+gem 'mocha', github: 'floehopper/mocha', require: false
 gem 'rack-test', github: 'brynary/rack-test'
 gem 'rack-cache', '~> 1.2'
 gem 'bcrypt-ruby', '~> 3.0.0'
diff --git a/activesupport/lib/active_support/testing/mocha_module.rb b/activesupport/lib/active_support/testing/mocha_module.rb
index ed2942d23a..833dc867f0 100644
--- a/activesupport/lib/active_support/testing/mocha_module.rb
+++ b/activesupport/lib/active_support/testing/mocha_module.rb
@@ -2,7 +2,7 @@ module ActiveSupport
   module Testing
     module MochaModule
       begin
-        require 'mocha_standalone'
+        require 'mocha/api'
         include Mocha::API
 
         def before_setup