diff --git a/apps/federation/tests/api/ocsauthapitest.php b/apps/federation/tests/API/OCSAuthAPITest.php
similarity index 100%
rename from apps/federation/tests/api/ocsauthapitest.php
rename to apps/federation/tests/API/OCSAuthAPITest.php
diff --git a/apps/federation/tests/backgroundjob/getsharedsecrettest.php b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
similarity index 100%
rename from apps/federation/tests/backgroundjob/getsharedsecrettest.php
rename to apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
diff --git a/apps/federation/tests/backgroundjob/requestsharedsecrettest.php b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
similarity index 100%
rename from apps/federation/tests/backgroundjob/requestsharedsecrettest.php
rename to apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
diff --git a/apps/federation/tests/controller/settingscontrollertest.php b/apps/federation/tests/Controller/SettingsControllerTest.php
similarity index 100%
rename from apps/federation/tests/controller/settingscontrollertest.php
rename to apps/federation/tests/Controller/SettingsControllerTest.php
diff --git a/apps/federation/tests/dav/fedauthtest.php b/apps/federation/tests/DAV/FedAuthTest.php
similarity index 100%
rename from apps/federation/tests/dav/fedauthtest.php
rename to apps/federation/tests/DAV/FedAuthTest.php
diff --git a/apps/federation/tests/lib/dbhandlertest.php b/apps/federation/tests/Lib/DbHandlerTest.php
similarity index 99%
rename from apps/federation/tests/lib/dbhandlertest.php
rename to apps/federation/tests/Lib/DbHandlerTest.php
index 3ded486d36..03a740b027 100644
--- a/apps/federation/tests/lib/dbhandlertest.php
+++ b/apps/federation/tests/Lib/DbHandlerTest.php
@@ -21,7 +21,7 @@
  */
 
 
-namespace OCA\Federation\Tests\lib;
+namespace OCA\Federation\Tests\Lib;
 
 
 use OCA\Federation\DbHandler;
diff --git a/apps/federation/tests/lib/hookstest.php b/apps/federation/tests/Lib/HooksTest.php
similarity index 98%
rename from apps/federation/tests/lib/hookstest.php
rename to apps/federation/tests/Lib/HooksTest.php
index 71569226dd..6f917b4bb6 100644
--- a/apps/federation/tests/lib/hookstest.php
+++ b/apps/federation/tests/Lib/HooksTest.php
@@ -20,7 +20,7 @@
  */
 
 
-namespace OCA\Federation\Tests\lib;
+namespace OCA\Federation\Tests\Lib;
 
 
 use OCA\Federation\Hooks;
diff --git a/apps/federation/tests/lib/syncfederationaddressbookstest.php b/apps/federation/tests/Lib/SyncFederationAddressbooksTest.php
similarity index 98%
rename from apps/federation/tests/lib/syncfederationaddressbookstest.php
rename to apps/federation/tests/Lib/SyncFederationAddressbooksTest.php
index aa2bd9ac2c..2d7945b969 100644
--- a/apps/federation/tests/lib/syncfederationaddressbookstest.php
+++ b/apps/federation/tests/Lib/SyncFederationAddressbooksTest.php
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-namespace OCA\Federation\Tests\lib;
+namespace OCA\Federation\Tests\Lib;
 
 use OCA\Federation\DbHandler;
 use OCA\Federation\SyncFederationAddressBooks;
diff --git a/apps/federation/tests/lib/trustedserverstest.php b/apps/federation/tests/Lib/TrustedServersTest.php
similarity index 99%
rename from apps/federation/tests/lib/trustedserverstest.php
rename to apps/federation/tests/Lib/TrustedServersTest.php
index a8c7c7afb1..167734b2f6 100644
--- a/apps/federation/tests/lib/trustedserverstest.php
+++ b/apps/federation/tests/Lib/TrustedServersTest.php
@@ -21,7 +21,7 @@
  */
 
 
-namespace OCA\Federation\Tests\lib;
+namespace OCA\Federation\Tests\Lib;
 
 
 use OCA\Federation\DbHandler;
diff --git a/apps/federation/tests/middleware/addservermiddlewaretest.php b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
similarity index 100%
rename from apps/federation/tests/middleware/addservermiddlewaretest.php
rename to apps/federation/tests/Middleware/AddServerMiddlewareTest.php