diff --git a/Tests/Functional/DiscoveryTest.php b/Tests/Functional/DiscoveryTest.php
index c016c93d..cf09b375 100644
--- a/Tests/Functional/DiscoveryTest.php
+++ b/Tests/Functional/DiscoveryTest.php
@@ -4,6 +4,7 @@
 
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
+use Http\Discovery\HttpClientDiscovery;
 use Http\HttplugBundle\DependencyInjection\HttplugExtension;
 use Http\Message\MessageFactory;
 use Http\Message\StreamFactory;
@@ -65,5 +66,9 @@ public function testNoDiscoveryFallbacks()
         $this->setDefinition('httplug.async_client.default', new Definition(HttpAsyncClient::class));
 
         $this->load();
+
+        $this->assertContainerBuilderHasService('httplug.client.default', HttpClient::class);
+        $clientDefinition = $this->container->getDefinition('httplug.client.default');
+        $this->assertEquals([HttpClientDiscovery::class, 'find'], $clientDefinition->getFactory());
     }
 }
diff --git a/Tests/Unit/Collector/FormatterTest.php b/Tests/Unit/Collector/FormatterTest.php
index a8e4c320..105560f9 100644
--- a/Tests/Unit/Collector/FormatterTest.php
+++ b/Tests/Unit/Collector/FormatterTest.php
@@ -14,12 +14,12 @@
 class FormatterTest extends TestCase
 {
     /**
-     * @var MessageFormatter
+     * @var MessageFormatter|\PHPUnit_Framework_MockObject_MockObject
      */
     private $formatter;
 
     /**
-     * @var MessageFormatter
+     * @var CurlCommandFormatter|\PHPUnit_Framework_MockObject_MockObject
      */
     private $curlFormatter;
 
diff --git a/Tests/Unit/DependencyInjection/HttplugExtensionTest.php b/Tests/Unit/DependencyInjection/HttplugExtensionTest.php
index 801e2d61..c22c08c5 100644
--- a/Tests/Unit/DependencyInjection/HttplugExtensionTest.php
+++ b/Tests/Unit/DependencyInjection/HttplugExtensionTest.php
@@ -2,6 +2,7 @@
 
 namespace Http\HttplugBundle\Tests\Unit\DependencyInjection;
 
+use Http\Client\HttpClient;
 use Http\HttplugBundle\Collector\PluginClientFactoryListener;
 use Http\HttplugBundle\DependencyInjection\HttplugExtension;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
@@ -265,6 +266,7 @@ public function testUsingServiceKeyForClients()
     private function verifyProfilingDisabled()
     {
         $def = $this->container->findDefinition('httplug.client');
+        $this->assertTrue(is_subclass_of($def->getClass(), HttpClient::class));
         $arguments = $def->getArguments();
 
         if (isset($arguments[3])) {