diff --git a/module/VuFind/src/VuFind/Tests/DbTestCase.php b/module/VuFind/src/VuFindTest/DbTestCase.php
similarity index 99%
rename from module/VuFind/src/VuFind/Tests/DbTestCase.php
rename to module/VuFind/src/VuFindTest/DbTestCase.php
index b55a4599c152d590086510a75d0574ce7687d71a..99a9b9df700157992bce79581dd2f7822495b7e5 100644
--- a/module/VuFind/src/VuFind/Tests/DbTestCase.php
+++ b/module/VuFind/src/VuFindTest/DbTestCase.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;
+namespace VuFindTest;
 
 /**
  * Abstract base class for PHPUnit database test cases.
diff --git a/module/VuFind/src/VuFind/RecordDriver/TestHarness.php b/module/VuFind/src/VuFindTest/RecordDriver/TestHarness.php
similarity index 96%
rename from module/VuFind/src/VuFind/RecordDriver/TestHarness.php
rename to module/VuFind/src/VuFindTest/RecordDriver/TestHarness.php
index 8e0ceed187b3199cbc6bd6d9fce385a21d4d6ac6..aa24f6e02586617d174b6364233722694bc4a836 100644
--- a/module/VuFind/src/VuFind/RecordDriver/TestHarness.php
+++ b/module/VuFind/src/VuFindTest/RecordDriver/TestHarness.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/other_than_marc Wiki
  */
-namespace VuFind\RecordDriver;
+namespace VuFindTest\RecordDriver;
 
 /**
  * Test harness for simulating record drivers (ignore outside of test suite!)
@@ -36,7 +36,7 @@ namespace VuFind\RecordDriver;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/other_than_marc Wiki
  */
-class TestHarness extends AbstractBase
+class TestHarness extends \VuFind\RecordDriver\AbstractBase
 {
     /**
      * Magic method to set/retrieve fields.
diff --git a/module/VuFind/src/VuFind/Tests/TestCase.php b/module/VuFind/src/VuFindTest/TestCase.php
similarity index 99%
rename from module/VuFind/src/VuFind/Tests/TestCase.php
rename to module/VuFind/src/VuFindTest/TestCase.php
index 1f2fdcbb4dc1510a82dfd6d74989589fbbb54cee..5bc2c84411a9a0a4791b6f571f29d4363285fd53 100644
--- a/module/VuFind/src/VuFind/Tests/TestCase.php
+++ b/module/VuFind/src/VuFindTest/TestCase.php
@@ -27,7 +27,7 @@
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
 
-namespace VuFind\Tests;
+namespace VuFindTest;
 
 /**
  * Abstract base class for PHPUnit test cases.
diff --git a/module/VuFind/src/VuFind/Tests/ViewHelperTestCase.php b/module/VuFind/src/VuFindTest/ViewHelperTestCase.php
similarity index 99%
rename from module/VuFind/src/VuFind/Tests/ViewHelperTestCase.php
rename to module/VuFind/src/VuFindTest/ViewHelperTestCase.php
index d040a097d09883fb4e3c25a5070c86ff0ca29325..13e9507dc677a6b7e5f365adca79f6dd85293e6a 100644
--- a/module/VuFind/src/VuFind/Tests/ViewHelperTestCase.php
+++ b/module/VuFind/src/VuFindTest/ViewHelperTestCase.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;
+namespace VuFindTest;
 
 /**
  * Abstract base class for PHPUnit database test cases.