diff --git a/Gemfile b/Gemfile
index 76fbea380a72f44e64a2f5241dbefd893fa7a521..34fc04bcee02b78540fdba6c2080f7e817f74340 100644
--- a/Gemfile
+++ b/Gemfile
@@ -268,7 +268,7 @@ group :test do
 
   gem "factory_girl_rails", "4.7.0"
   gem "timecop",            "0.8.1"
-  gem "webmock",            "1.22.6", require: false
+  gem "webmock",            "2.1.0", require: false
   gem "shoulda-matchers",   "3.1.1"
 
   gem "diaspora_federation-test", "0.0.13"
diff --git a/Gemfile.lock b/Gemfile.lock
index 4290c4c40d47248d47163d18a12cccf6098a8a65..f3be8ee889ca3c91dfd2e9d122c7292e6af635f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -783,7 +783,7 @@ GEM
     valid (1.1.0)
     warden (1.2.6)
       rack (>= 1.0)
-    webmock (1.22.6)
+    webmock (2.1.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -922,7 +922,7 @@ DEPENDENCIES
   uglifier (= 3.0.0)
   unicorn (= 5.1.0)
   uuid (= 2.3.8)
-  webmock (= 1.22.6)
+  webmock (= 2.1.0)
   will_paginate (= 3.1.0)
 
 BUNDLED WITH