diff --git a/Gemfile b/Gemfile
index fa3db7b1..7cb4e7ba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ group :test do
   gem "omniauth-facebook"
   gem "omniauth-openid", "~> 1.0.1"
   gem "webrat", "0.7.3", require: false
-  gem "mocha", "~> 0.13.1", require: false
+  gem "mocha", "~> 1.0.0", require: false
 end
 
 platforms :jruby do
diff --git a/Gemfile.lock b/Gemfile.lock
index 02f31277..14b67539 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -63,10 +63,10 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.1)
+    metaclass (0.0.4)
     mime-types (1.23)
     minitest (4.7.5)
-    mocha (0.13.3)
+    mocha (1.0.0)
       metaclass (~> 0.0.1)
     moped (1.5.1)
     multi_json (1.7.9)
@@ -148,7 +148,7 @@ DEPENDENCIES
   activerecord-jdbcsqlite3-adapter
   devise!
   jruby-openssl
-  mocha (~> 0.13.1)
+  mocha (~> 1.0.0)
   mongoid!
   omniauth (~> 1.0.0)
   omniauth-facebook
diff --git a/gemfiles/Gemfile.rails-3.2-stable b/gemfiles/Gemfile.rails-3.2-stable
index 935e4271..d5740f25 100644
--- a/gemfiles/Gemfile.rails-3.2-stable
+++ b/gemfiles/Gemfile.rails-3.2-stable
@@ -11,7 +11,7 @@ group :test do
   gem "omniauth-facebook"
   gem "omniauth-openid", "~> 1.0.1"
   gem "webrat", "0.7.3", require: false
-  gem "mocha", "~> 0.13.1", require: false
+  gem "mocha", "~> 1.0.0", require: false
 end
 
 platforms :jruby do
diff --git a/gemfiles/Gemfile.rails-4.0-stable b/gemfiles/Gemfile.rails-4.0-stable
index 2c514031..d09acddd 100644
--- a/gemfiles/Gemfile.rails-4.0-stable
+++ b/gemfiles/Gemfile.rails-4.0-stable
@@ -11,7 +11,7 @@ group :test do
   gem "omniauth-facebook"
   gem "omniauth-openid", "~> 1.0.1"
   gem "webrat", "0.7.3", require: false
-  gem "mocha", "~> 0.13.1", require: false
+  gem "mocha", "~> 1.0.0", require: false
 end
 
 platforms :jruby do
diff --git a/gemfiles/Gemfile.rails-head b/gemfiles/Gemfile.rails-head
index c0b1d996..444294f9 100644
--- a/gemfiles/Gemfile.rails-head
+++ b/gemfiles/Gemfile.rails-head
@@ -11,7 +11,7 @@ group :test do
   gem "omniauth-facebook"
   gem "omniauth-openid", "~> 1.0.1"
   gem "webrat", "0.7.3", require: false
-  gem "mocha", "~> 0.14", require: false
+  gem "mocha", "~> 1.0.0", require: false
 end
 
 platforms :jruby do