diff --git a/tests/core/controller/TwoFactorChallengeControllerTest.php b/tests/Core/Controller/TwoFactorChallengeControllerTest.php
similarity index 98%
rename from tests/core/controller/TwoFactorChallengeControllerTest.php
rename to tests/Core/Controller/TwoFactorChallengeControllerTest.php
index c65625ec32..aa1c7d39cf 100644
--- a/tests/core/controller/TwoFactorChallengeControllerTest.php
+++ b/tests/Core/Controller/TwoFactorChallengeControllerTest.php
@@ -20,8 +20,9 @@
  *
  */
 
-namespace OC\Core\Controller;
+namespace Test\Core\Controller;
 
+use OC\Core\Controller\TwoFactorChallengeController;
 use Test\TestCase;
 
 class TwoFactorChallengeControllerTest extends TestCase {
diff --git a/tests/core/middleware/TwoFactorMiddlewareTest.php b/tests/Core/Middleware/TwoFactorMiddlewareTest.php
similarity index 98%
rename from tests/core/middleware/TwoFactorMiddlewareTest.php
rename to tests/Core/Middleware/TwoFactorMiddlewareTest.php
index 12136db7fd..248793bf98 100644
--- a/tests/core/middleware/TwoFactorMiddlewareTest.php
+++ b/tests/Core/Middleware/TwoFactorMiddlewareTest.php
@@ -20,8 +20,9 @@
  *
  */
 
-namespace OC\Core\Middleware;
+namespace Test\Core\Middleware;
 
+use OC\Core\Middleware\TwoFactorMiddleware;
 use Test\TestCase;
 
 class TwoFactorMiddlewareTest extends TestCase {
diff --git a/tests/settings/controller/AuthSettingsControllerTest.php b/tests/Settings/Controller/AuthSettingsControllerTest.php
similarity index 100%
rename from tests/settings/controller/AuthSettingsControllerTest.php
rename to tests/Settings/Controller/AuthSettingsControllerTest.php