diff --git a/Gemfile b/Gemfile
index 65bf5e16f..3d3090c58 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ group :development, :test do
   gem 'minitest-focus'
   gem 'minitest-rails'
   gem 'minitest-reporters'
-  gem 'mocha'
+  gem 'mocha', '>= 1.5'
   gem 'pry'
   gem 'pry-remote'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 55cc5c72c..3d4c6c4b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -165,7 +165,7 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    mocha (1.2.1)
+    mocha (1.5.0)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
     multi_xml (0.6.0)
@@ -291,7 +291,7 @@ DEPENDENCIES
   minitest-focus
   minitest-rails
   minitest-reporters
-  mocha
+  mocha (>= 1.5)
   mysql2
   omniauth-facebook!
   omniauth-github!
diff --git a/gemfiles/rails_4_2.gemfile b/gemfiles/rails_4_2.gemfile
index 1bc7c37ed..ea26a991b 100644
--- a/gemfiles/rails_4_2.gemfile
+++ b/gemfiles/rails_4_2.gemfile
@@ -22,7 +22,7 @@ group :development, :test do
   gem "minitest-focus"
   gem "minitest-rails"
   gem "minitest-reporters"
-  gem "mocha"
+  gem "mocha", ">= 1.5"
   gem "pry"
   gem "pry-remote"
 end
diff --git a/gemfiles/rails_5_0.gemfile b/gemfiles/rails_5_0.gemfile
index 8ff29fc8a..09183de9b 100644
--- a/gemfiles/rails_5_0.gemfile
+++ b/gemfiles/rails_5_0.gemfile
@@ -20,7 +20,7 @@ group :development, :test do
   gem "minitest-focus"
   gem "minitest-rails"
   gem "minitest-reporters"
-  gem "mocha"
+  gem "mocha", ">= 1.5"
   gem "pry"
   gem "pry-remote"
 end
diff --git a/gemfiles/rails_5_1.gemfile b/gemfiles/rails_5_1.gemfile
index 8e4189419..8ac7a6359 100644
--- a/gemfiles/rails_5_1.gemfile
+++ b/gemfiles/rails_5_1.gemfile
@@ -20,7 +20,7 @@ group :development, :test do
   gem "minitest-focus"
   gem "minitest-rails"
   gem "minitest-reporters"
-  gem "mocha"
+  gem "mocha", ">= 1.5"
   gem "pry"
   gem "pry-remote"
 end