diff --git a/Tests/Unit/BaseTest.php b/Tests/Unit/BaseTestCase.php
similarity index 96%
rename from Tests/Unit/BaseTest.php
rename to Tests/Unit/BaseTestCase.php
index 7ebf236..783e95d 100644
--- a/Tests/Unit/BaseTest.php
+++ b/Tests/Unit/BaseTestCase.php
@@ -32,7 +32,7 @@
  * @package Restler
  * @subpackage Tests
  */
-class BaseTest extends UnitTestCase
+abstract class BaseTestCase extends UnitTestCase
 {
     /**
      * call unaccessible method of an object (to test it)
diff --git a/Tests/Unit/Configuration/ExtensionConfigurationTest.php b/Tests/Unit/Configuration/ExtensionConfigurationTest.php
index f053299..b58f098 100644
--- a/Tests/Unit/Configuration/ExtensionConfigurationTest.php
+++ b/Tests/Unit/Configuration/ExtensionConfigurationTest.php
@@ -27,12 +27,12 @@
  ***************************************************************/
 
 use Aoe\Restler\Configuration\ExtensionConfiguration;
-use Aoe\Restler\Tests\Unit\BaseTest;
+use Aoe\Restler\Tests\Unit\BaseTestCase;
 
 /**
  * @covers \Aoe\Restler\Configuration\ExtensionConfiguration
  */
-class ExtensionConfigurationTest extends BaseTest
+class ExtensionConfigurationTest extends BaseTestCase
 {
     /**
      * @var ExtensionConfiguration
diff --git a/Tests/Unit/Controller/BeUserAuthenticationControllerTest.php b/Tests/Unit/Controller/BeUserAuthenticationControllerTest.php
index 6bd06c4..11ebda2 100644
--- a/Tests/Unit/Controller/BeUserAuthenticationControllerTest.php
+++ b/Tests/Unit/Controller/BeUserAuthenticationControllerTest.php
@@ -28,7 +28,7 @@
 
 use Aoe\Restler\Controller\BeUserAuthenticationController;
 use Aoe\Restler\System\TYPO3\Loader as TYPO3Loader;
-use Aoe\Restler\Tests\Unit\BaseTest;
+use Aoe\Restler\Tests\Unit\BaseTestCase;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 
 /**
@@ -37,7 +37,7 @@
  *
  * @covers \Aoe\Restler\Controller\BeUserAuthenticationController
  */
-class BeUserAuthenticationControllerTest extends BaseTest
+class BeUserAuthenticationControllerTest extends BaseTestCase
 {
     /**
      * @var BeUserAuthenticationController
diff --git a/Tests/Unit/Controller/ExplorerAuthenticationControllerTest.php b/Tests/Unit/Controller/ExplorerAuthenticationControllerTest.php
index 42ee64e..0087487 100644
--- a/Tests/Unit/Controller/ExplorerAuthenticationControllerTest.php
+++ b/Tests/Unit/Controller/ExplorerAuthenticationControllerTest.php
@@ -27,7 +27,7 @@
  ***************************************************************/
 
 use Aoe\Restler\Controller\ExplorerAuthenticationController;
-use Aoe\Restler\Tests\Unit\BaseTest;
+use Aoe\Restler\Tests\Unit\BaseTestCase;
 use Luracast\Restler\Data\ApiMethodInfo;
 use Luracast\Restler\Explorer\v2\Explorer;
 use Luracast\Restler\Restler;
@@ -38,7 +38,7 @@
  *
  * @covers \Aoe\Restler\Controller\ExplorerAuthenticationController
  */
-class ExplorerAuthenticationControllerTest extends BaseTest
+class ExplorerAuthenticationControllerTest extends BaseTestCase
 {
     /**
      * @var ApiMethodInfo
diff --git a/Tests/Unit/Controller/FeUserAuthenticationControllerTest.php b/Tests/Unit/Controller/FeUserAuthenticationControllerTest.php
index 1a0251b..d03e629 100644
--- a/Tests/Unit/Controller/FeUserAuthenticationControllerTest.php
+++ b/Tests/Unit/Controller/FeUserAuthenticationControllerTest.php
@@ -28,7 +28,7 @@
 
 use Aoe\Restler\Controller\FeUserAuthenticationController;
 use Aoe\Restler\System\TYPO3\Loader as TYPO3Loader;
-use Aoe\Restler\Tests\Unit\BaseTest;
+use Aoe\Restler\Tests\Unit\BaseTestCase;
 use Luracast\Restler\Data\ApiMethodInfo;
 use Luracast\Restler\Restler;
 
@@ -38,7 +38,7 @@
  *
  * @covers \Aoe\Restler\Controller\FeUserAuthenticationController
  */
-class FeUserAuthenticationControllerTest extends BaseTest
+class FeUserAuthenticationControllerTest extends BaseTestCase
 {
     /**
      * @var FeUserAuthenticationController
diff --git a/Tests/Unit/System/DispatcherTest.php b/Tests/Unit/System/DispatcherTest.php
index 9dee6d7..bc81726 100644
--- a/Tests/Unit/System/DispatcherTest.php
+++ b/Tests/Unit/System/DispatcherTest.php
@@ -29,7 +29,7 @@
 use Aoe\Restler\Configuration\ExtensionConfiguration;
 use Aoe\Restler\System\Dispatcher;
 use Aoe\Restler\System\Restler\Builder;
-use Aoe\Restler\Tests\Unit\BaseTest;
+use Aoe\Restler\Tests\Unit\BaseTestCase;
 use Luracast\Restler\Restler;
 use PHPUnit\Framework\MockObject\MockObject;
 use TYPO3\CMS\Core\Http\Uri;
@@ -41,7 +41,7 @@
  *
  * @covers \Aoe\Restler\System\Dispatcher
  */
-class DispatcherTest extends BaseTest
+class DispatcherTest extends BaseTestCase
 {
     /**
      * @var Dispatcher
diff --git a/Tests/Unit/System/RestApi/RestApiClientTest.php b/Tests/Unit/System/RestApi/RestApiClientTest.php
index b079ff8..8669c2c 100644
--- a/Tests/Unit/System/RestApi/RestApiClientTest.php
+++ b/Tests/Unit/System/RestApi/RestApiClientTest.php
@@ -33,7 +33,7 @@
 use Aoe\Restler\System\RestApi\RestApiRequestScope;
 use Aoe\Restler\System\Restler\Builder as RestlerBuilder;
 use Aoe\Restler\System\TYPO3\Cache as Typo3Cache;
-use Aoe\Restler\Tests\Unit\BaseTest;
+use Aoe\Restler\Tests\Unit\BaseTestCase;
 use Luracast\Restler\RestException;
 use Luracast\Restler\Restler;
 
@@ -43,7 +43,7 @@
  *
  * @covers \Aoe\Restler\System\RestApi\RestApiClient
  */
-class RestApiClientTest extends BaseTest
+class RestApiClientTest extends BaseTestCase
 {
     /**
      * @var ExtensionConfiguration
diff --git a/Tests/Unit/System/RestApi/RestApiRequestTest.php b/Tests/Unit/System/RestApi/RestApiRequestTest.php
index 7867d41..cef8c43 100644
--- a/Tests/Unit/System/RestApi/RestApiRequestTest.php
+++ b/Tests/Unit/System/RestApi/RestApiRequestTest.php
@@ -29,7 +29,7 @@
 use Aoe\Restler\System\RestApi\RestApiRequest;
 use Aoe\Restler\System\RestApi\RestApiRequestScope;
 use Aoe\Restler\System\TYPO3\Cache as Typo3Cache;
-use Aoe\Restler\Tests\Unit\BaseTest;
+use Aoe\Restler\Tests\Unit\BaseTestCase;
 use Exception;
 use Luracast\Restler\RestException;
 use Luracast\Restler\Restler;
@@ -40,7 +40,7 @@
  *
  * @covers \Aoe\Restler\System\RestApi\RestApiRequest
  */
-class RestApiRequestTest extends BaseTest
+class RestApiRequestTest extends BaseTestCase
 {
     /**
      * @var array
diff --git a/Tests/Unit/System/Restler/BuilderTest.php b/Tests/Unit/System/Restler/BuilderTest.php
index 7c4cb22..cfe0c0b 100644
--- a/Tests/Unit/System/Restler/BuilderTest.php
+++ b/Tests/Unit/System/Restler/BuilderTest.php
@@ -30,7 +30,7 @@
 use Aoe\Restler\System\Restler\Builder;
 use Aoe\Restler\System\Restler\RestlerExtended;
 use Aoe\Restler\System\TYPO3\Cache;
-use Aoe\Restler\Tests\Unit\BaseTest;
+use Aoe\Restler\Tests\Unit\BaseTestCase;
 use Aoe\Restler\Tests\Unit\System\Restler\Fixtures\ValidConfiguration;
 use InvalidArgumentException;
 use Luracast\Restler\Defaults;
@@ -49,7 +49,7 @@
  *
  * @covers \Aoe\Restler\System\Restler\Builder
  */
-class BuilderTest extends BaseTest
+class BuilderTest extends BaseTestCase
 {
     /**
      * @var Builder
diff --git a/Tests/Unit/System/Restler/ConfigurationTest.php b/Tests/Unit/System/Restler/ConfigurationTest.php
index 5518d16..1000c85 100644
--- a/Tests/Unit/System/Restler/ConfigurationTest.php
+++ b/Tests/Unit/System/Restler/ConfigurationTest.php
@@ -31,7 +31,7 @@
 use Aoe\Restler\Controller\ExplorerAuthenticationController;
 use Aoe\Restler\Controller\FeUserAuthenticationController;
 use Aoe\Restler\System\Restler\Configuration;
-use Aoe\Restler\Tests\Unit\BaseTest;
+use Aoe\Restler\Tests\Unit\BaseTestCase;
 use Luracast\Restler\Explorer\v2\Explorer;
 use Luracast\Restler\Restler;
 
@@ -41,7 +41,7 @@
  *
  * @covers \Aoe\Restler\System\Restler\Configuration
  */
-class ConfigurationTest extends BaseTest
+class ConfigurationTest extends BaseTestCase
 {
     /**
      * @var ExtensionConfiguration
diff --git a/Tests/Unit/System/Restler/ExceptionHandlerTest.php b/Tests/Unit/System/Restler/ExceptionHandlerTest.php
index 1ee8306..e8d7989 100644
--- a/Tests/Unit/System/Restler/ExceptionHandlerTest.php
+++ b/Tests/Unit/System/Restler/ExceptionHandlerTest.php
@@ -26,7 +26,7 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-use Aoe\Restler\Tests\Unit\BaseTest;
+use Aoe\Restler\Tests\Unit\BaseTestCase;
 use Aoe\Restler\Tests\Unit\System\Restler\Fixtures\ExceptionHandler;
 use Luracast\Restler\RestException;
 use Luracast\Restler\Restler;
@@ -37,7 +37,7 @@
  *
  * @covers \Aoe\Restler\System\Restler\AbstractExceptionHandler
  */
-class ExceptionHandlerTest extends BaseTest
+class ExceptionHandlerTest extends BaseTestCase
 {
     /**
      * @dataProvider statusCodes
diff --git a/Tests/Unit/System/TYPO3/CacheTest.php b/Tests/Unit/System/TYPO3/CacheTest.php
index 2f2ebeb..72b2e6c 100644
--- a/Tests/Unit/System/TYPO3/CacheTest.php
+++ b/Tests/Unit/System/TYPO3/CacheTest.php
@@ -27,7 +27,7 @@
  ***************************************************************/
 
 use Aoe\Restler\System\TYPO3\Cache;
-use Aoe\Restler\Tests\Unit\BaseTest;
+use Aoe\Restler\Tests\Unit\BaseTestCase;
 use TYPO3\CMS\Core\Cache\CacheManager;
 use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
 
@@ -37,7 +37,7 @@
  *
  * @covers \Aoe\Restler\System\TYPO3\Cache
  */
-class CacheTest extends BaseTest
+class CacheTest extends BaseTestCase
 {
     /**
      * @var Cache