diff --git a/Gemfile b/Gemfile
index 41476b3bb..92cc2ab58 100644
--- a/Gemfile
+++ b/Gemfile
@@ -291,7 +291,7 @@ group :test do
 
   gem "factory_girl_rails", "4.8.0"
   gem "timecop",            "0.9.1"
-  gem "webmock",            "2.3.2", require: false
+  gem "webmock",            "3.0.1", require: false
   gem "shoulda-matchers",   "3.1.1"
 
   gem "diaspora_federation-test", "0.2.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 4758e9384..a9363be1b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -285,7 +285,7 @@ GEM
       execjs (~> 2.0)
       sprockets (>= 2.0.0)
       tilt (>= 1.2)
-    hashdiff (0.3.2)
+    hashdiff (0.3.4)
     hashie (3.5.6)
     hike (1.2.3)
     hitimes (1.2.5)
@@ -743,7 +743,7 @@ GEM
       activesupport
       httpclient (>= 2.4)
       multi_json
-    webmock (2.3.2)
+    webmock (3.0.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -895,7 +895,7 @@ DEPENDENCIES
   unicorn-worker-killer (= 0.4.4)
   uuid (= 2.3.8)
   versionist (= 1.5.0)
-  webmock (= 2.3.2)
+  webmock (= 3.0.1)
   will_paginate (= 3.1.6)
 
 BUNDLED WITH