diff --git a/lib/diaspora_federation/fetcher.rb b/lib/diaspora_federation/fetcher.rb
index 4ece8eb..b702aa1 100644
--- a/lib/diaspora_federation/fetcher.rb
+++ b/lib/diaspora_federation/fetcher.rb
@@ -1,6 +1,5 @@
 require "faraday"
 require "faraday_middleware/response/follow_redirects"
-require "typhoeus/adapters/faraday"
 
 module DiasporaFederation
   # A wrapper for {https://github.com/lostisland/faraday Faraday} used for
@@ -32,7 +31,7 @@ module DiasporaFederation
 
       @connection = Faraday::Connection.new(options) do |builder|
         builder.use FaradayMiddleware::FollowRedirects, limit: 4
-        builder.adapter :typhoeus
+        builder.adapter Faraday.default_adapter
       end
 
       @connection.headers["User-Agent"] = "DiasporaFederation/#{DiasporaFederation::VERSION}"
diff --git a/test/dummy/config/initializers/faraday.rb b/test/dummy/config/initializers/faraday.rb
new file mode 100644
index 0000000..027a3fa
--- /dev/null
+++ b/test/dummy/config/initializers/faraday.rb
@@ -0,0 +1,5 @@
+# Use net_http in test, that's better supported by webmock
+unless Rails.env.test?
+  require "typhoeus/adapters/faraday"
+  Faraday.default_adapter = :typhoeus
+end