diff --git a/module/VuFind/tests/phpunit.xml b/module/VuFind/tests/phpunit.xml
index 63d53bda6b081ddb2823c1c42aa0df91df8a8d34..75839736a1c06ebeea7f86ce87a616ba40e10a19 100644
--- a/module/VuFind/tests/phpunit.xml
+++ b/module/VuFind/tests/phpunit.xml
@@ -1,5 +1,8 @@
 <phpunit bootstrap="./bootstrap.php" backupGlobals="false">
   <testsuites>
+    <testsuite name="VuFindHttp">
+      <directory>../../VuFindHttp/tests/unit-tests/src</directory>
+    </testsuite>
     <testsuite name="VuFindUnit">
       <directory>unit-tests/src</directory>
     </testsuite>
diff --git a/module/VuFindHttp/src/VuFindHttp/HttpService.php b/module/VuFindHttp/src/VuFindHttp/HttpService.php
index b17833f3070c8417366191b181ecb2b40d1a6f4c..27d408c6df56160063958373a3a9864323d9983c 100644
--- a/module/VuFindHttp/src/VuFindHttp/HttpService.php
+++ b/module/VuFindHttp/src/VuFindHttp/HttpService.php
@@ -57,6 +57,13 @@ class HttpService implements HttpServiceInterface
      */
     protected $proxyConfig;
 
+    /**
+     * Default adapter
+     *
+     * @var \Zend\Http\Client\Adapter\AdapterInterface
+     */
+    protected $defaultAdapter = null;
+
     /**
      * Constructor.
      *
@@ -149,6 +156,18 @@ class HttpService implements HttpServiceInterface
         return $this->post($url, $body, \Zend\Http\Client::ENC_URLENCODED, $timeout);
     }
 
+    /**
+     * Set a default HTTP adapter (primarily for testing purposes).
+     *
+     * @param \Zend\Http\Client\Adapter\AdapterInterface $adapter Adapter
+     *
+     * @return void
+     */
+    public function setDefaultAdapter(\Zend\Http\Client\Adapter\AdapterInterface $adapter)
+    {
+        $this->defaultAdapter = $adapter;
+    }
+
     /**
      * Return a new HTTP client.
      *
@@ -162,6 +181,9 @@ class HttpService implements HttpServiceInterface
     {
         $client = new \Zend\Http\Client();
         $client->setMethod($method);
+        if (null !== $this->defaultAdapter) {
+            $client->setAdapter($this->defaultAdapter);
+        }
         if (null !== $url) {
             $client->setUri($url);
         }