diff --git a/framework/core/composer.json b/framework/core/composer.json
index fd4f82bb2..4716f046a 100644
--- a/framework/core/composer.json
+++ b/framework/core/composer.json
@@ -70,7 +70,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\": "tests/"
+            "Flarum\\Tests\\": "tests/"
         }
     },
     "extra": {
diff --git a/framework/core/tests/Flarum/Api/ExceptionHandler/FloodingExceptionHandlerTest.php b/framework/core/tests/Api/ExceptionHandler/FloodingExceptionHandlerTest.php
similarity index 93%
rename from framework/core/tests/Flarum/Api/ExceptionHandler/FloodingExceptionHandlerTest.php
rename to framework/core/tests/Api/ExceptionHandler/FloodingExceptionHandlerTest.php
index 2dbfc2c51..5b9b72398 100644
--- a/framework/core/tests/Flarum/Api/ExceptionHandler/FloodingExceptionHandlerTest.php
+++ b/framework/core/tests/Api/ExceptionHandler/FloodingExceptionHandlerTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\ExceptionHandler;
+namespace Flarum\Tests\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\FloodingExceptionHandler;
 use Flarum\Post\Exception\FloodingException;
-use Tests\Test\TestCase;
+use Flarum\Tests\Test\TestCase;
 
 class FloodingExceptionHandlerTest extends TestCase
 {
diff --git a/framework/core/tests/Flarum/Api/ExceptionHandler/IlluminateValidationExceptionHandlerTest.php b/framework/core/tests/Api/ExceptionHandler/IlluminateValidationExceptionHandlerTest.php
similarity index 95%
rename from framework/core/tests/Flarum/Api/ExceptionHandler/IlluminateValidationExceptionHandlerTest.php
rename to framework/core/tests/Api/ExceptionHandler/IlluminateValidationExceptionHandlerTest.php
index c757c0e6b..adbcc588d 100644
--- a/framework/core/tests/Flarum/Api/ExceptionHandler/IlluminateValidationExceptionHandlerTest.php
+++ b/framework/core/tests/Api/ExceptionHandler/IlluminateValidationExceptionHandlerTest.php
@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\ExceptionHandler;
+namespace Flarum\Tests\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\IlluminateValidationExceptionHandler;
+use Flarum\Tests\Test\TestCase;
 use Illuminate\Translation\ArrayLoader;
 use Illuminate\Translation\Translator;
 use Illuminate\Validation\Factory;
 use Illuminate\Validation\ValidationException;
-use Tests\Test\TestCase;
 
 class IlluminateValidationExceptionHandlerTest extends TestCase
 {
diff --git a/framework/core/tests/Flarum/Api/ExceptionHandler/InvalidAccessTokenExceptionHandlerTest.php b/framework/core/tests/Api/ExceptionHandler/InvalidAccessTokenExceptionHandlerTest.php
similarity index 93%
rename from framework/core/tests/Flarum/Api/ExceptionHandler/InvalidAccessTokenExceptionHandlerTest.php
rename to framework/core/tests/Api/ExceptionHandler/InvalidAccessTokenExceptionHandlerTest.php
index a1ad094ed..bb270319f 100644
--- a/framework/core/tests/Flarum/Api/ExceptionHandler/InvalidAccessTokenExceptionHandlerTest.php
+++ b/framework/core/tests/Api/ExceptionHandler/InvalidAccessTokenExceptionHandlerTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\ExceptionHandler;
+namespace Flarum\Tests\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\Exception\InvalidAccessTokenException;
 use Flarum\Api\ExceptionHandler\InvalidAccessTokenExceptionHandler;
-use Tests\Test\TestCase;
+use Flarum\Tests\Test\TestCase;
 
 class InvalidAccessTokenExceptionHandlerTest extends TestCase
 {
diff --git a/framework/core/tests/Flarum/Api/ExceptionHandler/InvalidConfirmationTokenExceptionHandlerTest.php b/framework/core/tests/Api/ExceptionHandler/InvalidConfirmationTokenExceptionHandlerTest.php
similarity index 93%
rename from framework/core/tests/Flarum/Api/ExceptionHandler/InvalidConfirmationTokenExceptionHandlerTest.php
rename to framework/core/tests/Api/ExceptionHandler/InvalidConfirmationTokenExceptionHandlerTest.php
index 107573da8..f04b8edde 100644
--- a/framework/core/tests/Flarum/Api/ExceptionHandler/InvalidConfirmationTokenExceptionHandlerTest.php
+++ b/framework/core/tests/Api/ExceptionHandler/InvalidConfirmationTokenExceptionHandlerTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\ExceptionHandler;
+namespace Flarum\Tests\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\InvalidConfirmationTokenExceptionHandler;
+use Flarum\Tests\Test\TestCase;
 use Flarum\User\Exception\InvalidConfirmationTokenException;
-use Tests\Test\TestCase;
 
 class InvalidConfirmationTokenExceptionHandlerTest extends TestCase
 {
diff --git a/framework/core/tests/Flarum/Api/ExceptionHandler/MethodNotAllowedExceptionHandlerTest.php b/framework/core/tests/Api/ExceptionHandler/MethodNotAllowedExceptionHandlerTest.php
similarity index 93%
rename from framework/core/tests/Flarum/Api/ExceptionHandler/MethodNotAllowedExceptionHandlerTest.php
rename to framework/core/tests/Api/ExceptionHandler/MethodNotAllowedExceptionHandlerTest.php
index 4604ab5ca..2da7da65d 100644
--- a/framework/core/tests/Flarum/Api/ExceptionHandler/MethodNotAllowedExceptionHandlerTest.php
+++ b/framework/core/tests/Api/ExceptionHandler/MethodNotAllowedExceptionHandlerTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\ExceptionHandler;
+namespace Flarum\Tests\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\MethodNotAllowedExceptionHandler;
 use Flarum\Http\Exception\MethodNotAllowedException;
-use Tests\Test\TestCase;
+use Flarum\Tests\Test\TestCase;
 
 class MethodNotAllowedExceptionHandlerTest extends TestCase
 {
diff --git a/framework/core/tests/Flarum/Api/ExceptionHandler/ModelNotFoundExceptionHandlerTest.php b/framework/core/tests/Api/ExceptionHandler/ModelNotFoundExceptionHandlerTest.php
similarity index 93%
rename from framework/core/tests/Flarum/Api/ExceptionHandler/ModelNotFoundExceptionHandlerTest.php
rename to framework/core/tests/Api/ExceptionHandler/ModelNotFoundExceptionHandlerTest.php
index 0ef326f76..4e097d446 100644
--- a/framework/core/tests/Flarum/Api/ExceptionHandler/ModelNotFoundExceptionHandlerTest.php
+++ b/framework/core/tests/Api/ExceptionHandler/ModelNotFoundExceptionHandlerTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\ExceptionHandler;
+namespace Flarum\Tests\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\ModelNotFoundExceptionHandler;
+use Flarum\Tests\Test\TestCase;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Tests\Test\TestCase;
 
 class ModelNotFoundExceptionHandlerTest extends TestCase
 {
diff --git a/framework/core/tests/Flarum/Api/ExceptionHandler/PermissionDeniedExceptionHandlerTest.php b/framework/core/tests/Api/ExceptionHandler/PermissionDeniedExceptionHandlerTest.php
similarity index 93%
rename from framework/core/tests/Flarum/Api/ExceptionHandler/PermissionDeniedExceptionHandlerTest.php
rename to framework/core/tests/Api/ExceptionHandler/PermissionDeniedExceptionHandlerTest.php
index dbdaf6275..ffdb0e9f4 100644
--- a/framework/core/tests/Flarum/Api/ExceptionHandler/PermissionDeniedExceptionHandlerTest.php
+++ b/framework/core/tests/Api/ExceptionHandler/PermissionDeniedExceptionHandlerTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\ExceptionHandler;
+namespace Flarum\Tests\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\PermissionDeniedExceptionHandler;
+use Flarum\Tests\Test\TestCase;
 use Flarum\User\Exception\PermissionDeniedException;
-use Tests\Test\TestCase;
 
 class PermissionDeniedExceptionHandlerTest extends TestCase
 {
diff --git a/framework/core/tests/Flarum/Api/ExceptionHandler/RouteNotFoundExceptionHandlerTest.php b/framework/core/tests/Api/ExceptionHandler/RouteNotFoundExceptionHandlerTest.php
similarity index 93%
rename from framework/core/tests/Flarum/Api/ExceptionHandler/RouteNotFoundExceptionHandlerTest.php
rename to framework/core/tests/Api/ExceptionHandler/RouteNotFoundExceptionHandlerTest.php
index 83c64fdc3..61659c53e 100644
--- a/framework/core/tests/Flarum/Api/ExceptionHandler/RouteNotFoundExceptionHandlerTest.php
+++ b/framework/core/tests/Api/ExceptionHandler/RouteNotFoundExceptionHandlerTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\ExceptionHandler;
+namespace Flarum\Tests\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\RouteNotFoundExceptionHandler;
 use Flarum\Http\Exception\RouteNotFoundException;
-use Tests\Test\TestCase;
+use Flarum\Tests\Test\TestCase;
 
 class RouteNotFoundExceptionHandlerTest extends TestCase
 {
diff --git a/framework/core/tests/Flarum/Api/ExceptionHandler/TokenMismatchExceptionHandlerTest.php b/framework/core/tests/Api/ExceptionHandler/TokenMismatchExceptionHandlerTest.php
similarity index 93%
rename from framework/core/tests/Flarum/Api/ExceptionHandler/TokenMismatchExceptionHandlerTest.php
rename to framework/core/tests/Api/ExceptionHandler/TokenMismatchExceptionHandlerTest.php
index 928b3cae3..352b156a0 100644
--- a/framework/core/tests/Flarum/Api/ExceptionHandler/TokenMismatchExceptionHandlerTest.php
+++ b/framework/core/tests/Api/ExceptionHandler/TokenMismatchExceptionHandlerTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\ExceptionHandler;
+namespace Flarum\Tests\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\TokenMismatchExceptionHandler;
 use Flarum\Http\Exception\TokenMismatchException;
-use Tests\Test\TestCase;
+use Flarum\Tests\Test\TestCase;
 
 class TokenMismatchExceptionHandlerTest extends TestCase
 {
diff --git a/framework/core/tests/Flarum/Api/ExceptionHandler/ValidationExceptionHandlerTest.php b/framework/core/tests/Api/ExceptionHandler/ValidationExceptionHandlerTest.php
similarity index 95%
rename from framework/core/tests/Flarum/Api/ExceptionHandler/ValidationExceptionHandlerTest.php
rename to framework/core/tests/Api/ExceptionHandler/ValidationExceptionHandlerTest.php
index 29b912350..1cd125467 100644
--- a/framework/core/tests/Flarum/Api/ExceptionHandler/ValidationExceptionHandlerTest.php
+++ b/framework/core/tests/Api/ExceptionHandler/ValidationExceptionHandlerTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\ExceptionHandler;
+namespace Flarum\Tests\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\ValidationExceptionHandler;
 use Flarum\Foundation\ValidationException;
-use Tests\Test\TestCase;
+use Flarum\Tests\Test\TestCase;
 
 class ValidationExceptionHandlerTest extends TestCase
 {
diff --git a/framework/core/tests/Flarum/Settings/DatabaseSettingsRepositoryTest.php b/framework/core/tests/Settings/DatabaseSettingsRepositoryTest.php
similarity index 94%
rename from framework/core/tests/Flarum/Settings/DatabaseSettingsRepositoryTest.php
rename to framework/core/tests/Settings/DatabaseSettingsRepositoryTest.php
index 310f623fc..134651487 100644
--- a/framework/core/tests/Flarum/Settings/DatabaseSettingsRepositoryTest.php
+++ b/framework/core/tests/Settings/DatabaseSettingsRepositoryTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Settings;
+namespace Flarum\Tests\Settings;
 
 use Flarum\Settings\DatabaseSettingsRepository;
+use Flarum\Tests\Test\TestCase;
 use Illuminate\Database\ConnectionInterface;
 use Mockery as m;
-use Tests\Test\TestCase;
 
 class DatabaseSettingsRepositoryTest extends TestCase
 {
diff --git a/framework/core/tests/Flarum/Settings/MemoryCacheSettingsRepositoryTest.php b/framework/core/tests/Settings/MemoryCacheSettingsRepositoryTest.php
similarity index 95%
rename from framework/core/tests/Flarum/Settings/MemoryCacheSettingsRepositoryTest.php
rename to framework/core/tests/Settings/MemoryCacheSettingsRepositoryTest.php
index 8c4a1f56b..6d69d81ef 100644
--- a/framework/core/tests/Flarum/Settings/MemoryCacheSettingsRepositoryTest.php
+++ b/framework/core/tests/Settings/MemoryCacheSettingsRepositoryTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Settings;
+namespace Flarum\Tests\Flarum\Settings;
 
 use Flarum\Settings\MemoryCacheSettingsRepository;
 use Flarum\Settings\SettingsRepositoryInterface;
+use Flarum\Tests\Test\TestCase;
 use Mockery as m;
-use Tests\Test\TestCase;
 
 class MemoryCacheSettingsRepositoryTest extends TestCase
 {
diff --git a/framework/core/tests/Test/TestCase.php b/framework/core/tests/Test/TestCase.php
index 864eb3b5d..b9f2459e2 100644
--- a/framework/core/tests/Test/TestCase.php
+++ b/framework/core/tests/Test/TestCase.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Test;
+namespace Flarum\Tests\Test;
 
 use Mockery;
 use PHPUnit\Framework\TestCase as Test;