diff --git a/config/initializers/faraday.rb b/config/initializers/faraday.rb
index ad1384f6d..d22e92e35 100644
--- a/config/initializers/faraday.rb
+++ b/config/initializers/faraday.rb
@@ -1,6 +1,13 @@
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
+
+# Use net_http in test, that's better supported by webmock
+unless Rails.env.test?
+  require 'typhoeus/adapters/faraday'
+  Faraday.default_adapter = :typhoeus
+end
+
 options = {
   request: {
     timeout: 25
diff --git a/spec/lib/diaspora/fetcher/public_spec.rb b/spec/lib/diaspora/fetcher/public_spec.rb
index 43f249cab..28726b2e4 100644
--- a/spec/lib/diaspora/fetcher/public_spec.rb
+++ b/spec/lib/diaspora/fetcher/public_spec.rb
@@ -19,7 +19,7 @@ describe Diaspora::Fetcher::Public do
 
     stub_request(:get, /remote-testpod.net\/people\/.*/)
       .with(headers: {
-            'Accept'=>'application/json', 
+            'Accept'=>'application/json',
             'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
             'User-Agent'=>'diaspora-fetcher'
       }).to_return(:body => @fixture)