diff --git a/CHANGELOG.md b/CHANGELOG.md
index c840fc0..e789cf2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+### Unreleased
+
+### Changed
+
+- Guzzle setup conforms to HTTPlug requirement now: Minimal functionality in client
 
 ## 0.2.0 - 2015-12-15
 
diff --git a/src/Guzzle6HttpAdapter.php b/src/Guzzle6HttpAdapter.php
index 06f1f30..269a8c9 100644
--- a/src/Guzzle6HttpAdapter.php
+++ b/src/Guzzle6HttpAdapter.php
@@ -4,6 +4,8 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
+use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Middleware;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
 use Http\Client\Tools\HttpClientEmulator;
@@ -28,7 +30,12 @@ class Guzzle6HttpAdapter implements HttpClient, HttpAsyncClient
      */
     public function __construct(ClientInterface $client = null)
     {
-        $this->client = $client ?: new Client();
+        if (!$client) {
+            $handlerStack = new HandlerStack();
+            $handlerStack->push(Middleware::prepareBody(), 'prepare_body');
+            $client = new Client(['handler' => $handlerStack]);
+        }
+        $this->client = $client;
     }
 
     /**