diff --git a/core/lib/Drupal/Core/Http/HandlerStackConfigurator.php b/core/lib/Drupal/Core/Http/HandlerStackConfigurator.php
index 8e9e36a..ab45cf3 100644
--- a/core/lib/Drupal/Core/Http/HandlerStackConfigurator.php
+++ b/core/lib/Drupal/Core/Http/HandlerStackConfigurator.php
@@ -79,7 +79,7 @@ protected function initializeMiddlewares() {
   }
 
   /**
-   * Configures the handler stack using services tagged as http_middleware.
+   * Configures the stack using services tagged as http_client_middleware.
    *
    * @param \GuzzleHttp\HandlerStack $handler_stack
    *   The handler stack
diff --git a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
index f80d59d..292f3f8 100644
--- a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
+++ b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
@@ -33,9 +33,7 @@ class UpdateFetcherTest extends UnitTestCase {
    */
   protected function setUp() {
     $config_factory = $this->getConfigFactoryStub(array('update.settings' => array('fetch_url' => 'http://www.example.com')));
-    $http_client_mock = $this->getMockBuilder('Drupal\Core\Http\Client')
-      ->disableOriginalConstructor()
-      ->getMock();
+    $http_client_mock = $this->getMock('\GuzzleHttp\ClientInterface');
     $this->updateFetcher = new UpdateFetcher($config_factory, $http_client_mock);
   }