diff --git a/module/VuFind/tests/unit-tests/src/Auth/DatabaseTest.php b/module/VuFind/tests/unit-tests/src/Auth/DatabaseTest.php
index 00ad8638e9ceb9765c3fd630bc0e4d5a03788ca7..a2d50e46472a7448582d0f5019e463de841ac78a 100644
--- a/module/VuFind/tests/unit-tests/src/Auth/DatabaseTest.php
+++ b/module/VuFind/tests/unit-tests/src/Auth/DatabaseTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\Auth;
+namespace VuFindTest\Auth;
 use VuFind\Auth\Database;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\Auth\Database;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class DatabaseTest extends \VuFind\Tests\DbTestCase
+class DatabaseTest extends \VuFindTest\DbTestCase
 {
     protected $auth;
 
diff --git a/module/VuFind/tests/unit-tests/src/Auth/ILSTest.php b/module/VuFind/tests/unit-tests/src/Auth/ILSTest.php
index a9fac52cd74fdcf12ed8cef796d6474a54af407d..7ad3abee3c659c1a9d74f1a51eccb32b80003278 100644
--- a/module/VuFind/tests/unit-tests/src/Auth/ILSTest.php
+++ b/module/VuFind/tests/unit-tests/src/Auth/ILSTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\Auth;
+namespace VuFindTest\Auth;
 use VuFind\Auth\ILS, VuFind\Db\Table\User;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\Auth\ILS, VuFind\Db\Table\User;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class ILSTest extends \VuFind\Tests\DbTestCase
+class ILSTest extends \VuFindTest\DbTestCase
 {
     protected $auth;
     protected $driver;
diff --git a/module/VuFind/tests/unit-tests/src/Auth/LDAPTest.php b/module/VuFind/tests/unit-tests/src/Auth/LDAPTest.php
index 927304ccb95da9ba3e91d47f60c8017fcf07b6cc..9e99c4e0895c8d77c7546400a18ffec367ce1f7b 100644
--- a/module/VuFind/tests/unit-tests/src/Auth/LDAPTest.php
+++ b/module/VuFind/tests/unit-tests/src/Auth/LDAPTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\Auth;
+namespace VuFindTest\Auth;
 use VuFind\Auth\LDAP, Zend\Config\Config;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\Auth\LDAP, Zend\Config\Config;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class LDAPTest extends \VuFind\Tests\TestCase
+class LDAPTest extends \VuFindTest\TestCase
 {
     /**
      * Get an authentication object.
diff --git a/module/VuFind/tests/unit-tests/src/Auth/MultiAuthTest.php b/module/VuFind/tests/unit-tests/src/Auth/MultiAuthTest.php
index a161b7a738aa9e07127f95537b17a4619217c56d..def847cd1ee9426697df4dd15388cfb5c2c79125 100644
--- a/module/VuFind/tests/unit-tests/src/Auth/MultiAuthTest.php
+++ b/module/VuFind/tests/unit-tests/src/Auth/MultiAuthTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\Auth;
+namespace VuFindTest\Auth;
 use VuFind\Auth\MultiAuth, Zend\Config\Config;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\Auth\MultiAuth, Zend\Config\Config;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class MultiAuthTest extends \VuFind\Tests\TestCase
+class MultiAuthTest extends \VuFindTest\TestCase
 {
     /**
      * Get an authentication object.
diff --git a/module/VuFind/tests/unit-tests/src/Auth/SIP2Test.php b/module/VuFind/tests/unit-tests/src/Auth/SIP2Test.php
index bdc9328dc358a617e39defe3711cb790aa25be03..3495c71ce11265169b8fd9813f0baa048f93a002 100644
--- a/module/VuFind/tests/unit-tests/src/Auth/SIP2Test.php
+++ b/module/VuFind/tests/unit-tests/src/Auth/SIP2Test.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\Auth;
+namespace VuFindTest\Auth;
 use VuFind\Auth\SIP2, Zend\Config\Config;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\Auth\SIP2, Zend\Config\Config;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class SIP2Test extends \VuFind\Tests\TestCase
+class SIP2Test extends \VuFindTest\TestCase
 {
     /**
      * Get an authentication object.
diff --git a/module/VuFind/tests/unit-tests/src/Auth/ShibbolethTest.php b/module/VuFind/tests/unit-tests/src/Auth/ShibbolethTest.php
index 5af8af456bc983019fad731ed4f2541a6dea7770..42f552c44fe9e1d03287597adf89fe8a3154cfc8 100644
--- a/module/VuFind/tests/unit-tests/src/Auth/ShibbolethTest.php
+++ b/module/VuFind/tests/unit-tests/src/Auth/ShibbolethTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\Auth;
+namespace VuFindTest\Auth;
 use VuFind\Auth\Shibboleth, VuFind\Db\Table\User, Zend\Config\Config;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\Auth\Shibboleth, VuFind\Db\Table\User, Zend\Config\Config;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class ShibbolethTest extends \VuFind\Tests\DbTestCase
+class ShibbolethTest extends \VuFindTest\DbTestCase
 {
     /**
      * Standard setup method.
diff --git a/module/VuFind/tests/unit-tests/src/Code/ISBNTest.php b/module/VuFind/tests/unit-tests/src/Code/ISBNTest.php
index c2a1e5ebeb86f8e5f0a1ee4efd5e9297f1433e2b..908d518d718a561a799e1a39007fa79856620ca6 100644
--- a/module/VuFind/tests/unit-tests/src/Code/ISBNTest.php
+++ b/module/VuFind/tests/unit-tests/src/Code/ISBNTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-namespace VuFind\Tests\Code;
+namespace VuFindTest\Code;
 use VuFind\Code\ISBN;
 
 /**
@@ -38,7 +38,7 @@ use VuFind\Code\ISBN;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class ISBNTest extends \VuFind\Tests\TestCase
+class ISBNTest extends \VuFindTest\TestCase
 {
     /**
      * Test Valid ISBN-10.
diff --git a/module/VuFind/tests/unit-tests/src/Config/ReaderTest.php b/module/VuFind/tests/unit-tests/src/Config/ReaderTest.php
index f0747b6949d94c11b34e338f0070c1bbde5ef645..28fd43e8727e43fc1a557f9a5479690f3720e24f 100644
--- a/module/VuFind/tests/unit-tests/src/Config/ReaderTest.php
+++ b/module/VuFind/tests/unit-tests/src/Config/ReaderTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-namespace VuFind\Tests\Config;
+namespace VuFindTest\Config;
 use VuFind\Config\Reader;
 
 /**
@@ -38,7 +38,7 @@ use VuFind\Config\Reader;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class ReaderTest extends \VuFind\Tests\TestCase
+class ReaderTest extends \VuFindTest\TestCase
 {
     /**
      * Test basic config.ini loading.
diff --git a/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php b/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
index 42c2d1466990bf500b75a1e3319c203e969191ad..d8dd7f5cbf665ae7038cf97b21a69749e456d3db 100644
--- a/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
+++ b/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-namespace VuFind\Tests\Config;
+namespace VuFindTest\Config;
 use VuFind\Config\SearchSpecsReader;
 
 /**
@@ -38,7 +38,7 @@ use VuFind\Config\SearchSpecsReader;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class SearchSpecsReaderTest extends \VuFind\Tests\TestCase
+class SearchSpecsReaderTest extends \VuFindTest\TestCase
 {
     /**
      * Test loading of a YAML file.
diff --git a/module/VuFind/tests/unit-tests/src/Cookie/ContainerTest.php b/module/VuFind/tests/unit-tests/src/Cookie/ContainerTest.php
index a0e28b250917c4d42ba776b27ca4476861755552..ead9aecce35df38807aeec977e57cf70b836f8f9 100644
--- a/module/VuFind/tests/unit-tests/src/Cookie/ContainerTest.php
+++ b/module/VuFind/tests/unit-tests/src/Cookie/ContainerTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-namespace VuFind\Tests\Cookie;
+namespace VuFindTest\Cookie;
 use VuFind\Cookie\Container;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\Cookie\Container;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class ContainerTest extends \VuFind\Tests\TestCase
+class ContainerTest extends \VuFindTest\TestCase
 {
     protected $ns;
 
diff --git a/module/VuFind/tests/unit-tests/src/Date/ConverterTest.php b/module/VuFind/tests/unit-tests/src/Date/ConverterTest.php
index 51c3f75f8b5ee93c0ef79e45d5f71bfb26d6bdea..baa9c43b213fcc329e9950b360c278fe8d3ac8ab 100644
--- a/module/VuFind/tests/unit-tests/src/Date/ConverterTest.php
+++ b/module/VuFind/tests/unit-tests/src/Date/ConverterTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\Date;
+namespace VuFindTest\Date;
 use VuFind\Date\Converter, VuFind\Exception\Date as DateException,
     Zend\Config\Config;
 
@@ -38,7 +38,7 @@ use VuFind\Date\Converter, VuFind\Exception\Date as DateException,
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class ConverterTest extends \VuFind\Tests\TestCase
+class ConverterTest extends \VuFindTest\TestCase
 {
     protected $savedDateFormat = null;
     protected $savedTimeFormat = null;
diff --git a/module/VuFind/tests/unit-tests/src/Db/Table/ChangeTrackerTest.php b/module/VuFind/tests/unit-tests/src/Db/Table/ChangeTrackerTest.php
index 1cb07e2d76b1bf7702ed6bc74759c04f54976885..b42f9d715a84bdfc9ed04fc6276d4b27d47961e5 100644
--- a/module/VuFind/tests/unit-tests/src/Db/Table/ChangeTrackerTest.php
+++ b/module/VuFind/tests/unit-tests/src/Db/Table/ChangeTrackerTest.php
@@ -37,7 +37,7 @@ use VuFind\Db\Table\ChangeTracker;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class ChangeTrackerTest extends \VuFind\Tests\DbTestCase
+class ChangeTrackerTest extends \VuFindTest\DbTestCase
 {
     /**
      * Test change tracking
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/AlephTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/AlephTest.php
index b7e512f2e8116643073308377c570d76f172d1b7..73d9336664dfdbb1f8860eeb18f9649876095a2a 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/AlephTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/AlephTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\Aleph;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Aleph;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class AlephTest extends \VuFind\Tests\TestCase
+class AlephTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/AmicusTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/AmicusTest.php
index e009fc4bfea59595db955eb1b8d6268ea5562fd5..18a570a9f1638bb324193455ee445b4d59047cfb 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/AmicusTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/AmicusTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\Amicus;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Amicus;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class AmicusTest extends \VuFind\Tests\TestCase
+class AmicusTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/DAIATest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/DAIATest.php
index 9bb31a48365d956a6f6074c84930b2fdbae4b58e..2ea5490382976a5e4e1316cf3a3ac03569ddbb8b 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/DAIATest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/DAIATest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\DAIA;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\DAIA;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class DAIATest extends \VuFind\Tests\TestCase
+class DAIATest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/DemoTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/DemoTest.php
index 40b2cee02270b629ba2e201f98a4347aecd0bdb1..ffa2e6dc4352dbad9a8a39eb59a75cdb6d93237e 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/DemoTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/DemoTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\Demo;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Demo;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class DemoTest extends \VuFind\Tests\TestCase
+class DemoTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/EvergreenTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/EvergreenTest.php
index 53e3ac895d7280735b5808d6715f0fe7987cd694..de288f5217ff678e47e8338dfd5b06b7a3d33fc5 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/EvergreenTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/EvergreenTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\Evergreen;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Evergreen;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class EvergreenTest extends \VuFind\Tests\TestCase
+class EvergreenTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonTest.php
index 6f6b15bf174ef8ce7aa9b113ba99ffe9145c1940..45c88dad0b41c1432222fa0c81bd37f0832a3a7b 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\Horizon;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Horizon;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class HorizonTest extends \VuFind\Tests\TestCase
+class HorizonTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonXMLAPITest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonXMLAPITest.php
index dc26ae84185a508fc46782937eeae79e015fed29..75d902b70afddee5d236e599db9186dd595bb1c0 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonXMLAPITest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonXMLAPITest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\HorizonXMLAPI;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\HorizonXMLAPI;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class HorizonXMLAPITest extends \VuFind\Tests\TestCase
+class HorizonXMLAPITest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/InnovativeTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/InnovativeTest.php
index 93150045585bbb38050fc5776baa8a35ad3ff7a9..56897fb950f3c5ca5be180cffb54e934e8f408e8 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/InnovativeTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/InnovativeTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\Innovative;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Innovative;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class InnovativeTest extends \VuFind\Tests\TestCase
+class InnovativeTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/KohaTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/KohaTest.php
index b056ce9e2552fc607492100035a8199f0e556da9..0654309be02d22965c5a7affa2c97e93930ffea5 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/KohaTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/KohaTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\Koha;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Koha;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class KohaTest extends \VuFind\Tests\TestCase
+class KohaTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/NewGenLibTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/NewGenLibTest.php
index 297f2a7c54b29b6bc1888fb8f0b4574ad6e26fb3..81ec1317687ef8a1c8edd00c48f90611cf8819ea 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/NewGenLibTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/NewGenLibTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\NewGenLib;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\NewGenLib;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class NewGenLibTest extends \VuFind\Tests\TestCase
+class NewGenLibTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/NoILSTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/NoILSTest.php
index 318e252b39b990fad1eca8858150fb9a84e0d07b..235fbdb3109cd9aa22727ea663572c1dc3929e2a 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/NoILSTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/NoILSTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\NoILS;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\NoILS;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class NoILSTest extends \VuFind\Tests\TestCase
+class NoILSTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/PICATest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/PICATest.php
index 6d65c92c5486c9a85523b9639a8d9248c3a32a10..45e9bcb7ba2bf5f971187511c0f0ab45ee967dda 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/PICATest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/PICATest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\PICA;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\PICA;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class PICATest extends \VuFind\Tests\TestCase
+class PICATest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/SampleTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/SampleTest.php
index e2ddde207ead366e496bc8f3aff9445eb868b4a5..ccba98cf631ee8e8b979b2ae12bc0a3b27a1c19e 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/SampleTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/SampleTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\Sample;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Sample;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class SampleTest extends \VuFind\Tests\TestCase
+class SampleTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/SymphonyTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/SymphonyTest.php
index bf5e7d148263282b253e0b5684cec5eac856252b..f20dbf7d035ac3f8a9bc52d6d208e1ff1fd8378a 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/SymphonyTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/SymphonyTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\Symphony;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Symphony;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class SymphonyTest extends \VuFind\Tests\TestCase
+class SymphonyTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/UnicornTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/UnicornTest.php
index fa00efbab87c7c632a60904059e6cda1da3dba2f..d5c6a278e173a0fdff8028b15b2bc61aad2ad5c2 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/UnicornTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/UnicornTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\Unicorn;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Unicorn;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class UnicornTest extends \VuFind\Tests\TestCase
+class UnicornTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/VirtuaTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/VirtuaTest.php
index d9939456f89eaa188886f678a48fc50c7245126b..2d30f41c6fe25b72294239f5bb40c58f1117f8f3 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/VirtuaTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/VirtuaTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\Virtua;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Virtua;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class VirtuaTest extends \VuFind\Tests\TestCase
+class VirtuaTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerRestfulTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerRestfulTest.php
index c7bee219008e2367bd24bd7c5b5ae9dfba4f5c65..ca9f7d089ba6c58690e703af588fd36c5da5d0c1 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerRestfulTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerRestfulTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\VoyagerRestful;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\VoyagerRestful;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class VoyagerRestfulTest extends \VuFind\Tests\TestCase
+class VoyagerRestfulTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerTest.php
index 4e78c6fb800f00570bb4bc6c02d68c0edeabb91a..3d50337dc1fa282a316e31e2e37bda35c2724365 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\Voyager;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Voyager;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class VoyagerTest extends \VuFind\Tests\TestCase
+class VoyagerTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIP2Test.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIP2Test.php
index ba543fddf46637a2d6aa42f5b7ad6586b7d94534..91308c701349361602d2ec308bb8959e8ae6783c 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIP2Test.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIP2Test.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\XCNCIP2;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\XCNCIP2;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class XCNCIP2Test extends \VuFind\Tests\TestCase
+class XCNCIP2Test extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIPTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIPTest.php
index c0cd0755f80cd50748fa12a018b475a8df4019d6..75a5f8aa2395e15087c411905a6a1196727e03b5 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIPTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIPTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-namespace VuFind\Tests\ILS\Driver;
+namespace VuFindTest\ILS\Driver;
 use VuFind\ILS\Driver\XCNCIP;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\XCNCIP;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class XCNCIPTest extends \VuFind\Tests\TestCase
+class XCNCIPTest extends \VuFindTest\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/RecordDriver/SolrMarcTest.php b/module/VuFind/tests/unit-tests/src/RecordDriver/SolrMarcTest.php
index 52900ef337f82f9fc17154b547c613c9086508df..698ed84093f2478201c14933028d946d5473e1bc 100644
--- a/module/VuFind/tests/unit-tests/src/RecordDriver/SolrMarcTest.php
+++ b/module/VuFind/tests/unit-tests/src/RecordDriver/SolrMarcTest.php
@@ -39,7 +39,7 @@ namespace VuFind\Test\RecordDriver;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class SolrMarcTest extends \VuFind\Tests\TestCase
+class SolrMarcTest extends \VuFindTest\TestCase
 {
     /**
      * Test a record that used to be known to cause problems because of the way
diff --git a/module/VuFind/tests/unit-tests/src/Search/Base/ParamsTest.php b/module/VuFind/tests/unit-tests/src/Search/Base/ParamsTest.php
index 0bebb47638bbbb517dd339acdbb97fe671734e8c..8a32a8d765bdc6931a8eeee7ae07733f32737732 100644
--- a/module/VuFind/tests/unit-tests/src/Search/Base/ParamsTest.php
+++ b/module/VuFind/tests/unit-tests/src/Search/Base/ParamsTest.php
@@ -26,7 +26,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-namespace VuFind\Tests\Search\Base;
+namespace VuFindTest\Search\Base;
 
 /**
  * Base Search Object Parameters Test
@@ -38,7 +38,7 @@ namespace VuFind\Tests\Search\Base;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class ParamsTest extends \VuFind\Tests\TestCase
+class ParamsTest extends \VuFindTest\TestCase
 {
     /**
      * Test a record that used to be known to cause problems because of the way
diff --git a/module/VuFind/tests/unit-tests/src/Solr/UtilsTest.php b/module/VuFind/tests/unit-tests/src/Solr/UtilsTest.php
index 2dc0621aef96a67fff39d879b325fbebff6cfc69..5ec2ea0583e49ae4380da182c8fb4e7a6b982c23 100644
--- a/module/VuFind/tests/unit-tests/src/Solr/UtilsTest.php
+++ b/module/VuFind/tests/unit-tests/src/Solr/UtilsTest.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-namespace VuFind\Tests\Solr;
+namespace VuFindTest\Solr;
 use VuFind\Solr\Utils;
 
 /**
@@ -37,7 +37,7 @@ use VuFind\Solr\Utils;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class UtilsTest extends \VuFind\Tests\TestCase
+class UtilsTest extends \VuFindTest\TestCase
 {
     /**
      * Test capitalizeBooleans functionality.
diff --git a/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/CitationTest.php b/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/CitationTest.php
index 61d49fe0774e388c910aa781255aef2937c176e3..60dd4ae2e1f0ee0c87b4bcef6d5c6acc47f60e39 100644
--- a/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/CitationTest.php
+++ b/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/CitationTest.php
@@ -37,7 +37,7 @@ use VuFind\Theme\Root\Helper\Citation;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class CitationTest extends \VuFind\Tests\ViewHelperTestCase
+class CitationTest extends \VuFindTest\ViewHelperTestCase
 {
     /** Sample citations -- each element of this array contains three elements --
      * the raw input data and the expected apa/mla output citations.
@@ -285,7 +285,7 @@ class CitationTest extends \VuFind\Tests\ViewHelperTestCase
     {
         $citation = new Citation();
         $citation->setView($this->getPhpRenderer());
-        $driver = new \VuFind\RecordDriver\TestHarness();
+        $driver = new \VuFindTest\RecordDriver\TestHarness();
         foreach ($this->citations as $current) {
             $driver->setRawData($current['raw']);
             $cb = $citation->__invoke($driver);
diff --git a/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/ResultFeedTest.php b/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/ResultFeedTest.php
index 22c6f7a021e1baa071a295d1ce71e675c61613e4..e355f7011ef2311785bf09c7a90cabe2471dbf97 100644
--- a/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/ResultFeedTest.php
+++ b/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/ResultFeedTest.php
@@ -37,7 +37,7 @@ use VuFind\Theme\Root\Helper\ResultFeed;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class ResultFeedTest extends \VuFind\Tests\ViewHelperTestCase
+class ResultFeedTest extends \VuFindTest\ViewHelperTestCase
 {
     /**
      * Get plugins to register to support view helper being tested