diff --git a/module/VuFind/src/VuFindTest/Unit/AutoRetryTrait.php b/module/VuFind/src/VuFindTest/Unit/AutoRetryTrait.php
index 0e650f70d9900634b23c425d30793b864a57d418..42a3dbbb7bc03933d0faa4363eadc93220f0f8b4 100644
--- a/module/VuFind/src/VuFindTest/Unit/AutoRetryTrait.php
+++ b/module/VuFind/src/VuFindTest/Unit/AutoRetryTrait.php
@@ -58,7 +58,7 @@ trait AutoRetryTrait
      *
      * @return void
      */
-    public function runBare()
+    public function runBare(): void
     {
         // Fetch retry count from annotations, but make sure it's a sane number;
         // default to a single attempt with no retries unless told otherwise.
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Config/Reader/CacheDecoratorTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Config/Reader/CacheDecoratorTest.php
index d970a9ef65c1f557de1e0fd724d1b484e9819f1c..3ccda6821d87240746cf07a9633d7702fc219a32 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Config/Reader/CacheDecoratorTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Config/Reader/CacheDecoratorTest.php
@@ -48,13 +48,13 @@ class CacheDecoratorTest extends \PHPUnit\Framework\TestCase
      */
     public function testFromFileAndString()
     {
-        $cache = $this->getMockForAbstractClass('Zend\Cache\Storage\StorageInterface', ['setItem', 'hasItem']);
+        $cache = $this->getMockForAbstractClass('Zend\Cache\Storage\StorageInterface');
         $cache->expects($this->exactly(2))
             ->method('setItem');
         $cache->expects($this->exactly(2))
             ->method('hasItem')
             ->will($this->returnValue(false));
-        $reader = $this->getMockForAbstractClass('Zend\Config\Reader\ReaderInterface', ['fromFile', 'fromString']);
+        $reader = $this->getMockForAbstractClass('Zend\Config\Reader\ReaderInterface');
         $reader->expects($this->once())
             ->method('fromFile')
             ->will($this->returnValue([]));
@@ -73,7 +73,7 @@ class CacheDecoratorTest extends \PHPUnit\Framework\TestCase
      */
     public function testFromFileAndStringCached()
     {
-        $cache = $this->getMockForAbstractClass('Zend\Cache\Storage\StorageInterface', ['setItem', 'hasItem', 'getItem']);
+        $cache = $this->getMockForAbstractClass('Zend\Cache\Storage\StorageInterface');
         $cache->expects($this->never())
             ->method('setItem');
         $cache->expects($this->exactly(2))
@@ -82,7 +82,7 @@ class CacheDecoratorTest extends \PHPUnit\Framework\TestCase
         $cache->expects($this->exactly(2))
             ->method('getItem')
             ->will($this->returnValue([]));
-        $reader = $this->getMockForAbstractClass('Zend\Config\Reader\ReaderInterface', ['fromFile', 'fromString']);
+        $reader = $this->getMockForAbstractClass('Zend\Config\Reader\ReaderInterface');
         $deco = new CacheDecorator($reader, $cache);
         $deco->fromFile('ignore');
         $deco->fromString('ignore');