diff --git a/tests/settings/controller/AppSettingsControllerTest.php b/tests/Settings/Controller/AppSettingsControllerTest.php
similarity index 98%
rename from tests/settings/controller/AppSettingsControllerTest.php
rename to tests/Settings/Controller/AppSettingsControllerTest.php
index dba5728ca4..9dcc55e135 100644
--- a/tests/settings/controller/AppSettingsControllerTest.php
+++ b/tests/Settings/Controller/AppSettingsControllerTest.php
@@ -19,8 +19,9 @@
  *
  */
 
-namespace OC\Settings\Controller;
+namespace Tests\Settings\Controller;
 
+use OC\Settings\Controller\AppSettingsController;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\TemplateResponse;
@@ -36,7 +37,7 @@ use OC\OCSClient;
 /**
  * Class AppSettingsControllerTest
  *
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
  */
 class AppSettingsControllerTest extends TestCase {
 	/** @var AppSettingsController */
diff --git a/tests/settings/controller/CertificateControllerTest.php b/tests/Settings/Controller/CertificateControllerTest.php
similarity index 97%
rename from tests/settings/controller/CertificateControllerTest.php
rename to tests/Settings/Controller/CertificateControllerTest.php
index 2fdbbb8b0a..c9ea2a4024 100644
--- a/tests/settings/controller/CertificateControllerTest.php
+++ b/tests/Settings/Controller/CertificateControllerTest.php
@@ -19,8 +19,9 @@
  *
  */
 
-namespace OC\Settings\Controller;
+namespace Tests\Settings\Controller;
 
+use OC\Settings\Controller\CertificateController;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
@@ -31,7 +32,7 @@ use OCP\ICertificateManager;
 /**
  * Class CertificateControllerTest
  *
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
  */
 class CertificateControllerTest extends \Test\TestCase {
 	/** @var CertificateController */
diff --git a/tests/settings/controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php
similarity index 99%
rename from tests/settings/controller/CheckSetupControllerTest.php
rename to tests/Settings/Controller/CheckSetupControllerTest.php
index 3ce7c64b4a..f48e9c04f3 100644
--- a/tests/settings/controller/CheckSetupControllerTest.php
+++ b/tests/Settings/Controller/CheckSetupControllerTest.php
@@ -19,8 +19,9 @@
  *
  */
 
-namespace OC\Settings\Controller;
+namespace Tests\Settings\Controller;
 
+use OC\Settings\Controller\CheckSetupController;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataDisplayResponse;
 use OCP\AppFramework\Http\DataResponse;
@@ -47,7 +48,7 @@ function version_compare($version1, $version2) {
 /**
  * Class CheckSetupControllerTest
  *
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
  */
 class CheckSetupControllerTest extends TestCase {
 	/** @var int */
diff --git a/tests/settings/controller/EncryptionControllerTest.php b/tests/Settings/Controller/EncryptionControllerTest.php
similarity index 97%
rename from tests/settings/controller/EncryptionControllerTest.php
rename to tests/Settings/Controller/EncryptionControllerTest.php
index 565aaf29c9..adbbe2cf6a 100644
--- a/tests/settings/controller/EncryptionControllerTest.php
+++ b/tests/Settings/Controller/EncryptionControllerTest.php
@@ -19,10 +19,11 @@
  *
  */
 
-namespace OC\Settings\Controller;
+namespace Tests\Settings\Controller;
 
 use OC\DB\Connection;
 use OC\Files\View;
+use OC\Settings\Controller\EncryptionController;
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\ILogger;
@@ -33,7 +34,7 @@ use Test\TestCase;
 /**
  * Class EncryptionControllerTest
  *
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
  */
 class EncryptionControllerTest extends TestCase {
 	/** @var IRequest */
diff --git a/tests/settings/controller/groupscontrollertest.php b/tests/Settings/Controller/GroupsControllerTest.php
similarity index 98%
rename from tests/settings/controller/groupscontrollertest.php
rename to tests/Settings/Controller/GroupsControllerTest.php
index 82b4c7d3c0..70cb8282b2 100644
--- a/tests/settings/controller/groupscontrollertest.php
+++ b/tests/Settings/Controller/GroupsControllerTest.php
@@ -7,16 +7,18 @@
  * later.
  * See the COPYING-README file.
  */
-namespace OC\Settings\Controller;
+
+namespace Tests\Settings\Controller;
 
 use OC\Group\Group;
 use OC\Group\MetaData;
 use \OC\Settings\Application;
+use OC\Settings\Controller\GroupsController;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 
 /**
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
  */
 class GroupsControllerTest extends \Test\TestCase {
 
diff --git a/tests/settings/controller/logsettingscontrollertest.php b/tests/Settings/Controller/LogSettingsControllerTest.php
similarity index 95%
rename from tests/settings/controller/logsettingscontrollertest.php
rename to tests/Settings/Controller/LogSettingsControllerTest.php
index 60680ba464..092c04aecc 100644
--- a/tests/settings/controller/logsettingscontrollertest.php
+++ b/tests/Settings/Controller/LogSettingsControllerTest.php
@@ -7,13 +7,14 @@
  * later.
  * See the COPYING-README file.
  */
-namespace Test\Settings\Controller;
+
+namespace Tests\Settings\Controller;
 
 use \OC\Settings\Application;
 use OC\Settings\Controller\LogSettingsController;
 
 /**
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
  */
 class LogSettingsControllerTest extends \Test\TestCase {
 
diff --git a/tests/settings/controller/mailsettingscontrollertest.php b/tests/Settings/Controller/MailSettingsControllerTest.php
similarity index 98%
rename from tests/settings/controller/mailsettingscontrollertest.php
rename to tests/Settings/Controller/MailSettingsControllerTest.php
index cc25fda52f..1ac6bae69e 100644
--- a/tests/settings/controller/mailsettingscontrollertest.php
+++ b/tests/Settings/Controller/MailSettingsControllerTest.php
@@ -7,12 +7,13 @@
  * later.
  * See the COPYING-README file.
  */
-namespace OC\Settings\Controller;
 
-use \OC\Settings\Application;
+namespace Tests\Settings\Controller;
+
+use OC\Settings\Application;
 
 /**
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
  */
 class MailSettingsControllerTest extends \Test\TestCase {
 
diff --git a/tests/settings/controller/securitysettingscontrollertest.php b/tests/Settings/Controller/SecuritySettingsControllerTest.php
similarity index 93%
rename from tests/settings/controller/securitysettingscontrollertest.php
rename to tests/Settings/Controller/SecuritySettingsControllerTest.php
index 56848d8df3..11b0edcae2 100644
--- a/tests/settings/controller/securitysettingscontrollertest.php
+++ b/tests/Settings/Controller/SecuritySettingsControllerTest.php
@@ -7,12 +7,13 @@
  * later.
  * See the COPYING-README file.
  */
-namespace OC\Settings\Controller;
+namespace Tests\Settings\Controller;
 
 use \OC\Settings\Application;
+use OC\Settings\Controller\SecuritySettingsController;
 
 /**
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
  */
 class SecuritySettingsControllerTest extends \PHPUnit_Framework_TestCase {
 
diff --git a/tests/settings/controller/userscontrollertest.php b/tests/Settings/Controller/UsersControllerTest.php
similarity index 99%
rename from tests/settings/controller/userscontrollertest.php
rename to tests/Settings/Controller/UsersControllerTest.php
index 2a2b53d8ff..244d1f744d 100644
--- a/tests/settings/controller/userscontrollertest.php
+++ b/tests/Settings/Controller/UsersControllerTest.php
@@ -7,7 +7,8 @@
  * later.
  * See the COPYING-README file.
  */
-namespace OC\Settings\Controller;
+
+namespace Tests\Settings\Controller;
 
 use \OC\Settings\Application;
 use OCP\AppFramework\Http;
@@ -16,7 +17,7 @@ use OCP\AppFramework\Http\DataResponse;
 /**
  * @group DB
  *
- * @package OC\Settings\Controller
+ * @package Tests\Settings\Controller
  */
 class UsersControllerTest extends \Test\TestCase {
 
diff --git a/tests/settings/middleware/subadminmiddlewaretest.php b/tests/Settings/Middleware/SubadminMiddlewareTest.php
similarity index 96%
rename from tests/settings/middleware/subadminmiddlewaretest.php
rename to tests/Settings/Middleware/SubadminMiddlewareTest.php
index c16c21c9c1..652f8b2d15 100644
--- a/tests/settings/middleware/subadminmiddlewaretest.php
+++ b/tests/Settings/Middleware/SubadminMiddlewareTest.php
@@ -8,10 +8,11 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Settings\Middleware;
+namespace Tests\Settings\Middleware;
 
 use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException;
 use OC\AppFramework\Utility\ControllerMethodReflector;
+use OC\Settings\Middleware\SubadminMiddleware;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
 
@@ -19,7 +20,7 @@ use OCP\AppFramework\Http\TemplateResponse;
  * Verifies whether an user has at least subadmin rights.
  * To bypass use the `@NoSubadminRequired` annotation
  *
- * @package OC\Settings\Middleware
+ * @package Tests\Settings\Middleware
  */
 class SubadminMiddlewareTest extends \Test\TestCase {
 	/** @var SubadminMiddleware */