diff --git a/module/VuFind/src/VuFindTest/Unit/AbstractMakeTagTest.php b/module/VuFind/src/VuFindTest/Unit/AbstractMakeTagTestCase.php
similarity index 97%
rename from module/VuFind/src/VuFindTest/Unit/AbstractMakeTagTest.php
rename to module/VuFind/src/VuFindTest/Unit/AbstractMakeTagTestCase.php
index dc8f048c314..14f83674898 100644
--- a/module/VuFind/src/VuFindTest/Unit/AbstractMakeTagTest.php
+++ b/module/VuFind/src/VuFindTest/Unit/AbstractMakeTagTestCase.php
@@ -40,7 +40,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:testing:unit_tests Wiki
  */
-abstract class AbstractMakeTagTest extends \PHPUnit\Framework\TestCase
+abstract class AbstractMakeTagTestCase extends \PHPUnit\Framework\TestCase
 {
     /**
      * Get makeTag helper with mock view
diff --git a/module/VuFind/src/VuFindTest/Unit/AjaxHandlerTest.php b/module/VuFind/src/VuFindTest/Unit/AjaxHandlerTestCase.php
similarity index 97%
rename from module/VuFind/src/VuFindTest/Unit/AjaxHandlerTest.php
rename to module/VuFind/src/VuFindTest/Unit/AjaxHandlerTestCase.php
index 6911dc1ec39..45b36b394ef 100644
--- a/module/VuFind/src/VuFindTest/Unit/AjaxHandlerTest.php
+++ b/module/VuFind/src/VuFindTest/Unit/AjaxHandlerTestCase.php
@@ -42,7 +42,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
  */
-abstract class AjaxHandlerTest extends \PHPUnit\Framework\TestCase
+abstract class AjaxHandlerTestCase extends \PHPUnit\Framework\TestCase
 {
     /**
      * Mock container
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CheckRequestIsValidTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CheckRequestIsValidTest.php
index f38050600d9..90e912c2f54 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CheckRequestIsValidTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CheckRequestIsValidTest.php
@@ -44,7 +44,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
  */
-class CheckRequestIsValidTest extends \VuFindTest\Unit\AjaxHandlerTest
+class CheckRequestIsValidTest extends \VuFindTest\Unit\AjaxHandlerTestCase
 {
     /**
      * Set up a CheckRequestIsValid handler for testing.
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CommentRecordTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CommentRecordTest.php
index 170893b2db4..8f670b69e42 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CommentRecordTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/CommentRecordTest.php
@@ -47,7 +47,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
  */
-class CommentRecordTest extends \VuFindTest\Unit\AjaxHandlerTest
+class CommentRecordTest extends \VuFindTest\Unit\AjaxHandlerTestCase
 {
     /**
      * Set up a CommentRecord handler for testing.
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/DoiLookupTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/DoiLookupTest.php
index 837d038c46a..db980d9493b 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/DoiLookupTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/DoiLookupTest.php
@@ -44,7 +44,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
  */
-class DoiLookupTest extends \VuFindTest\Unit\AjaxHandlerTest
+class DoiLookupTest extends \VuFindTest\Unit\AjaxHandlerTestCase
 {
     use \VuFindTest\Feature\ConfigPluginManagerTrait;
 
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/GetResolverLinksTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/GetResolverLinksTest.php
index 2a096805d13..97b54c8eefb 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/GetResolverLinksTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/GetResolverLinksTest.php
@@ -44,7 +44,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
  */
-class GetResolverLinksTest extends \VuFindTest\Unit\AjaxHandlerTest
+class GetResolverLinksTest extends \VuFindTest\Unit\AjaxHandlerTestCase
 {
     use \VuFindTest\Feature\ConfigPluginManagerTrait;
 
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/KeepAliveTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/KeepAliveTest.php
index 46b48abcdb5..4eac4b0ebf5 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/KeepAliveTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/KeepAliveTest.php
@@ -42,7 +42,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
  */
-class KeepAliveTest extends \VuFindTest\Unit\AjaxHandlerTest
+class KeepAliveTest extends \VuFindTest\Unit\AjaxHandlerTestCase
 {
     /**
      * Test the AJAX handler's basic response.
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/RecommendTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/RecommendTest.php
index 66c6d53ca63..ca83bbe8260 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/RecommendTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/AjaxHandler/RecommendTest.php
@@ -49,7 +49,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
  */
-class RecommendTest extends \VuFindTest\Unit\AjaxHandlerTest
+class RecommendTest extends \VuFindTest\Unit\AjaxHandlerTestCase
 {
     /**
      * Get a mock params object.
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/AbstractMultiDriverTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/AbstractMultiDriverTestCase.php
similarity index 99%
rename from module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/AbstractMultiDriverTest.php
rename to module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/AbstractMultiDriverTestCase.php
index 53801104996..e77091cb79b 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/AbstractMultiDriverTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/AbstractMultiDriverTestCase.php
@@ -50,7 +50,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
  */
-abstract class AbstractMultiDriverTest extends \PHPUnit\Framework\TestCase
+abstract class AbstractMultiDriverTestCase extends \PHPUnit\Framework\TestCase
 {
     use \VuFindTest\Feature\ConfigPluginManagerTrait;
     use \VuFindTest\Feature\ReflectionTrait;
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/ComposedDriverTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/ComposedDriverTest.php
index 55e6c236fd2..f57361943fe 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/ComposedDriverTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/ComposedDriverTest.php
@@ -45,7 +45,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
  */
-class ComposedDriverTest extends AbstractMultiDriverTest
+class ComposedDriverTest extends AbstractMultiDriverTestCase
 {
     /**
      * Test that driver handles missing main ILS driver configuration properly.
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php
index 0a6317e7025..284be257a08 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php
@@ -47,7 +47,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
  */
-class MultiBackendTest extends AbstractMultiDriverTest
+class MultiBackendTest extends AbstractMultiDriverTestCase
 {
     /**
      * Test that driver handles missing ILS driver configuration properly.
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/AbstractTokenRepositoryTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/AbstractTokenRepositoryTestCase.php
similarity index 98%
rename from module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/AbstractTokenRepositoryTest.php
rename to module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/AbstractTokenRepositoryTestCase.php
index 253ece63f36..74b3b38cbc1 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/AbstractTokenRepositoryTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/AbstractTokenRepositoryTestCase.php
@@ -43,7 +43,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:testing:unit_tests Wiki
  */
-abstract class AbstractTokenRepositoryTest extends \PHPUnit\Framework\TestCase
+abstract class AbstractTokenRepositoryTestCase extends \PHPUnit\Framework\TestCase
 {
     protected $accessTokenTable = [];
 
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/AccessTokenRepositoryTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/AccessTokenRepositoryTest.php
index f1837eb4b25..849d3840580 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/AccessTokenRepositoryTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/AccessTokenRepositoryTest.php
@@ -42,7 +42,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:testing:unit_tests Wiki
  */
-class AccessTokenRepositoryTest extends AbstractTokenRepositoryTest
+class AccessTokenRepositoryTest extends AbstractTokenRepositoryTestCase
 {
     /**
      * Test access token repository
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/AuthCodeRepositoryTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/AuthCodeRepositoryTest.php
index 918f61c5633..87db6e537d9 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/AuthCodeRepositoryTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/AuthCodeRepositoryTest.php
@@ -40,7 +40,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:testing:unit_tests Wiki
  */
-class AuthCodeRepositoryTest extends AbstractTokenRepositoryTest
+class AuthCodeRepositoryTest extends AbstractTokenRepositoryTestCase
 {
     /**
      * Test auth code repository
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/IdentityRepositoryTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/IdentityRepositoryTest.php
index fdeb920938d..9a517f4b28f 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/IdentityRepositoryTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/IdentityRepositoryTest.php
@@ -45,7 +45,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:testing:unit_tests Wiki
  */
-class IdentityRepositoryTest extends AbstractTokenRepositoryTest
+class IdentityRepositoryTest extends AbstractTokenRepositoryTestCase
 {
     /**
      * OAuth2 configuration
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/RefreshTokenRepositoryTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/RefreshTokenRepositoryTest.php
index 3d90b8deefd..f7873d9254c 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/RefreshTokenRepositoryTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/RefreshTokenRepositoryTest.php
@@ -42,7 +42,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:testing:unit_tests Wiki
  */
-class RefreshTokenRepositoryTest extends AbstractTokenRepositoryTest
+class RefreshTokenRepositoryTest extends AbstractTokenRepositoryTestCase
 {
     /**
      * Test refresh token repository
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/ScopeRepositoryTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/ScopeRepositoryTest.php
index ee7a52cbcd0..0d85248dd09 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/ScopeRepositoryTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/ScopeRepositoryTest.php
@@ -40,7 +40,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:testing:unit_tests Wiki
  */
-class ScopeRepositoryTest extends AbstractTokenRepositoryTest
+class ScopeRepositoryTest extends AbstractTokenRepositoryTestCase
 {
     /**
      * Data provider for testScopeRepository
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/MakeLinkTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/MakeLinkTest.php
index 9e7c42d9ee7..4ca12006afd 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/MakeLinkTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/MakeLinkTest.php
@@ -42,7 +42,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:testing:unit_tests Wiki
  */
-class MakeLinkTest extends \VuFindTest\Unit\AbstractMakeTagTest
+class MakeLinkTest extends \VuFindTest\Unit\AbstractMakeTagTestCase
 {
     /**
      * Get MakeLink helper with mock view
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/MakeTagTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/MakeTagTest.php
index 311f9e0f671..48719b20f2a 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/MakeTagTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/MakeTagTest.php
@@ -44,7 +44,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:testing:unit_tests Wiki
  */
-class MakeTagTest extends \VuFindTest\Unit\AbstractMakeTagTest
+class MakeTagTest extends \VuFindTest\Unit\AbstractMakeTagTestCase
 {
     /**
      * Get makeTag helper with mock view
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/PrintArrayHtmlTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/PrintArrayHtmlTest.php
index c5759681883..565fad26d71 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/PrintArrayHtmlTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/PrintArrayHtmlTest.php
@@ -30,7 +30,7 @@
 namespace VuFindTest\View\Helper\Root;
 
 use VuFind\View\Helper\Root\PrintArrayHtml;
-use VuFindTest\Unit\AbstractMakeTagTest;
+use VuFindTest\Unit\AbstractMakeTagTestCase;
 
 use function call_user_func;
 
@@ -43,7 +43,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:testing:unit_tests Wiki
  */
-class PrintArrayHtmlTest extends AbstractMakeTagTest
+class PrintArrayHtmlTest extends AbstractMakeTagTestCase
 {
     use \VuFindTest\Feature\ViewTrait;