diff --git a/tests/Flarum/Api/Handler/FloodingExceptionHandlerTest.php b/tests/Flarum/Api/ExceptionHandler/FloodingExceptionHandlerTest.php
similarity index 96%
rename from tests/Flarum/Api/Handler/FloodingExceptionHandlerTest.php
rename to tests/Flarum/Api/ExceptionHandler/FloodingExceptionHandlerTest.php
index 3abfbeade..2dbfc2c51 100644
--- a/tests/Flarum/Api/Handler/FloodingExceptionHandlerTest.php
+++ b/tests/Flarum/Api/ExceptionHandler/FloodingExceptionHandlerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\Handler;
+namespace Tests\Flarum\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\FloodingExceptionHandler;
diff --git a/tests/Flarum/Api/Handler/IlluminateValidationExceptionHandlerTest.php b/tests/Flarum/Api/ExceptionHandler/IlluminateValidationExceptionHandlerTest.php
similarity index 97%
rename from tests/Flarum/Api/Handler/IlluminateValidationExceptionHandlerTest.php
rename to tests/Flarum/Api/ExceptionHandler/IlluminateValidationExceptionHandlerTest.php
index fbdf16559..c757c0e6b 100644
--- a/tests/Flarum/Api/Handler/IlluminateValidationExceptionHandlerTest.php
+++ b/tests/Flarum/Api/ExceptionHandler/IlluminateValidationExceptionHandlerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\Handler;
+namespace Tests\Flarum\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\IlluminateValidationExceptionHandler;
diff --git a/tests/Flarum/Api/Handler/InvalidAccessTokenExceptionHandlerTest.php b/tests/Flarum/Api/ExceptionHandler/InvalidAccessTokenExceptionHandlerTest.php
similarity index 96%
rename from tests/Flarum/Api/Handler/InvalidAccessTokenExceptionHandlerTest.php
rename to tests/Flarum/Api/ExceptionHandler/InvalidAccessTokenExceptionHandlerTest.php
index 86620c558..a1ad094ed 100644
--- a/tests/Flarum/Api/Handler/InvalidAccessTokenExceptionHandlerTest.php
+++ b/tests/Flarum/Api/ExceptionHandler/InvalidAccessTokenExceptionHandlerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\Handler;
+namespace Tests\Flarum\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\Exception\InvalidAccessTokenException;
diff --git a/tests/Flarum/Api/Handler/InvalidConfirmationTokenExceptionHandlerTest.php b/tests/Flarum/Api/ExceptionHandler/InvalidConfirmationTokenExceptionHandlerTest.php
similarity index 96%
rename from tests/Flarum/Api/Handler/InvalidConfirmationTokenExceptionHandlerTest.php
rename to tests/Flarum/Api/ExceptionHandler/InvalidConfirmationTokenExceptionHandlerTest.php
index 19b918d2c..107573da8 100644
--- a/tests/Flarum/Api/Handler/InvalidConfirmationTokenExceptionHandlerTest.php
+++ b/tests/Flarum/Api/ExceptionHandler/InvalidConfirmationTokenExceptionHandlerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\Handler;
+namespace Tests\Flarum\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\InvalidConfirmationTokenExceptionHandler;
diff --git a/tests/Flarum/Api/Handler/MethodNotAllowedExceptionHandlerTest.php b/tests/Flarum/Api/ExceptionHandler/MethodNotAllowedExceptionHandlerTest.php
similarity index 96%
rename from tests/Flarum/Api/Handler/MethodNotAllowedExceptionHandlerTest.php
rename to tests/Flarum/Api/ExceptionHandler/MethodNotAllowedExceptionHandlerTest.php
index e9c2b4e95..4604ab5ca 100644
--- a/tests/Flarum/Api/Handler/MethodNotAllowedExceptionHandlerTest.php
+++ b/tests/Flarum/Api/ExceptionHandler/MethodNotAllowedExceptionHandlerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\Handler;
+namespace Tests\Flarum\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\MethodNotAllowedExceptionHandler;
diff --git a/tests/Flarum/Api/Handler/ModelNotFoundExceptionHandlerTest.php b/tests/Flarum/Api/ExceptionHandler/ModelNotFoundExceptionHandlerTest.php
similarity index 96%
rename from tests/Flarum/Api/Handler/ModelNotFoundExceptionHandlerTest.php
rename to tests/Flarum/Api/ExceptionHandler/ModelNotFoundExceptionHandlerTest.php
index fa0b88b9d..0ef326f76 100644
--- a/tests/Flarum/Api/Handler/ModelNotFoundExceptionHandlerTest.php
+++ b/tests/Flarum/Api/ExceptionHandler/ModelNotFoundExceptionHandlerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\Handler;
+namespace Tests\Flarum\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\ModelNotFoundExceptionHandler;
diff --git a/tests/Flarum/Api/Handler/PermissionDeniedExceptionHandlerTest.php b/tests/Flarum/Api/ExceptionHandler/PermissionDeniedExceptionHandlerTest.php
similarity index 96%
rename from tests/Flarum/Api/Handler/PermissionDeniedExceptionHandlerTest.php
rename to tests/Flarum/Api/ExceptionHandler/PermissionDeniedExceptionHandlerTest.php
index 0494f6240..dbdaf6275 100644
--- a/tests/Flarum/Api/Handler/PermissionDeniedExceptionHandlerTest.php
+++ b/tests/Flarum/Api/ExceptionHandler/PermissionDeniedExceptionHandlerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\Handler;
+namespace Tests\Flarum\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\PermissionDeniedExceptionHandler;
diff --git a/tests/Flarum/Api/Handler/RouteNotFoundExceptionHandlerTest.php b/tests/Flarum/Api/ExceptionHandler/RouteNotFoundExceptionHandlerTest.php
similarity index 96%
rename from tests/Flarum/Api/Handler/RouteNotFoundExceptionHandlerTest.php
rename to tests/Flarum/Api/ExceptionHandler/RouteNotFoundExceptionHandlerTest.php
index 6c2cca427..83c64fdc3 100644
--- a/tests/Flarum/Api/Handler/RouteNotFoundExceptionHandlerTest.php
+++ b/tests/Flarum/Api/ExceptionHandler/RouteNotFoundExceptionHandlerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\Handler;
+namespace Tests\Flarum\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\RouteNotFoundExceptionHandler;
diff --git a/tests/Flarum/Api/Handler/TokenMismatchExceptionHandlerTest.php b/tests/Flarum/Api/ExceptionHandler/TokenMismatchExceptionHandlerTest.php
similarity index 96%
rename from tests/Flarum/Api/Handler/TokenMismatchExceptionHandlerTest.php
rename to tests/Flarum/Api/ExceptionHandler/TokenMismatchExceptionHandlerTest.php
index 4faf9b7c8..928b3cae3 100644
--- a/tests/Flarum/Api/Handler/TokenMismatchExceptionHandlerTest.php
+++ b/tests/Flarum/Api/ExceptionHandler/TokenMismatchExceptionHandlerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\Handler;
+namespace Tests\Flarum\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\TokenMismatchExceptionHandler;
diff --git a/tests/Flarum/Api/Handler/ValidationExceptionHandlerTest.php b/tests/Flarum/Api/ExceptionHandler/ValidationExceptionHandlerTest.php
similarity index 97%
rename from tests/Flarum/Api/Handler/ValidationExceptionHandlerTest.php
rename to tests/Flarum/Api/ExceptionHandler/ValidationExceptionHandlerTest.php
index d3440f52f..29b912350 100644
--- a/tests/Flarum/Api/Handler/ValidationExceptionHandlerTest.php
+++ b/tests/Flarum/Api/ExceptionHandler/ValidationExceptionHandlerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Api\Handler;
+namespace Tests\Flarum\Api\ExceptionHandler;
 
 use Exception;
 use Flarum\Api\ExceptionHandler\ValidationExceptionHandler;
diff --git a/tests/Flarum/Core/Settings/DatabaseSettingsRepositoryTest.php b/tests/Flarum/Settings/DatabaseSettingsRepositoryTest.php
similarity index 96%
rename from tests/Flarum/Core/Settings/DatabaseSettingsRepositoryTest.php
rename to tests/Flarum/Settings/DatabaseSettingsRepositoryTest.php
index 60acc8719..310f623fc 100644
--- a/tests/Flarum/Core/Settings/DatabaseSettingsRepositoryTest.php
+++ b/tests/Flarum/Settings/DatabaseSettingsRepositoryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Core\Settings;
+namespace Tests\Flarum\Settings;
 
 use Flarum\Settings\DatabaseSettingsRepository;
 use Illuminate\Database\ConnectionInterface;
diff --git a/tests/Flarum/Core/Settings/MemoryCacheSettingsRepositoryTest.php b/tests/Flarum/Settings/MemoryCacheSettingsRepositoryTest.php
similarity index 97%
rename from tests/Flarum/Core/Settings/MemoryCacheSettingsRepositoryTest.php
rename to tests/Flarum/Settings/MemoryCacheSettingsRepositoryTest.php
index 4ae7fd7a1..8c4a1f56b 100644
--- a/tests/Flarum/Core/Settings/MemoryCacheSettingsRepositoryTest.php
+++ b/tests/Flarum/Settings/MemoryCacheSettingsRepositoryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Flarum\Core\Settings;
+namespace Tests\Flarum\Settings;
 
 use Flarum\Settings\MemoryCacheSettingsRepository;
 use Flarum\Settings\SettingsRepositoryInterface;