diff --git a/tests/Conf/TestConf.php b/tests/cases/Conf/TestConf.php
similarity index 100%
rename from tests/Conf/TestConf.php
rename to tests/cases/Conf/TestConf.php
diff --git a/tests/Db/SQLite3/Database/TestDatabaseArticleSQLite3.php b/tests/cases/Db/SQLite3/Database/TestDatabaseArticleSQLite3.php
similarity index 100%
rename from tests/Db/SQLite3/Database/TestDatabaseArticleSQLite3.php
rename to tests/cases/Db/SQLite3/Database/TestDatabaseArticleSQLite3.php
diff --git a/tests/Db/SQLite3/Database/TestDatabaseCleanupSQLite3.php b/tests/cases/Db/SQLite3/Database/TestDatabaseCleanupSQLite3.php
similarity index 100%
rename from tests/Db/SQLite3/Database/TestDatabaseCleanupSQLite3.php
rename to tests/cases/Db/SQLite3/Database/TestDatabaseCleanupSQLite3.php
diff --git a/tests/Db/SQLite3/Database/TestDatabaseFeedSQLite3.php b/tests/cases/Db/SQLite3/Database/TestDatabaseFeedSQLite3.php
similarity index 100%
rename from tests/Db/SQLite3/Database/TestDatabaseFeedSQLite3.php
rename to tests/cases/Db/SQLite3/Database/TestDatabaseFeedSQLite3.php
diff --git a/tests/Db/SQLite3/Database/TestDatabaseFolderSQLite3.php b/tests/cases/Db/SQLite3/Database/TestDatabaseFolderSQLite3.php
similarity index 100%
rename from tests/Db/SQLite3/Database/TestDatabaseFolderSQLite3.php
rename to tests/cases/Db/SQLite3/Database/TestDatabaseFolderSQLite3.php
diff --git a/tests/Db/SQLite3/Database/TestDatabaseLabelSQLite3.php b/tests/cases/Db/SQLite3/Database/TestDatabaseLabelSQLite3.php
similarity index 100%
rename from tests/Db/SQLite3/Database/TestDatabaseLabelSQLite3.php
rename to tests/cases/Db/SQLite3/Database/TestDatabaseLabelSQLite3.php
diff --git a/tests/Db/SQLite3/Database/TestDatabaseMetaSQLite3.php b/tests/cases/Db/SQLite3/Database/TestDatabaseMetaSQLite3.php
similarity index 100%
rename from tests/Db/SQLite3/Database/TestDatabaseMetaSQLite3.php
rename to tests/cases/Db/SQLite3/Database/TestDatabaseMetaSQLite3.php
diff --git a/tests/Db/SQLite3/Database/TestDatabaseMiscellanySQLite3.php b/tests/cases/Db/SQLite3/Database/TestDatabaseMiscellanySQLite3.php
similarity index 100%
rename from tests/Db/SQLite3/Database/TestDatabaseMiscellanySQLite3.php
rename to tests/cases/Db/SQLite3/Database/TestDatabaseMiscellanySQLite3.php
diff --git a/tests/Db/SQLite3/Database/TestDatabaseSessionSQLite3.php b/tests/cases/Db/SQLite3/Database/TestDatabaseSessionSQLite3.php
similarity index 100%
rename from tests/Db/SQLite3/Database/TestDatabaseSessionSQLite3.php
rename to tests/cases/Db/SQLite3/Database/TestDatabaseSessionSQLite3.php
diff --git a/tests/Db/SQLite3/Database/TestDatabaseSubscriptionSQLite3.php b/tests/cases/Db/SQLite3/Database/TestDatabaseSubscriptionSQLite3.php
similarity index 100%
rename from tests/Db/SQLite3/Database/TestDatabaseSubscriptionSQLite3.php
rename to tests/cases/Db/SQLite3/Database/TestDatabaseSubscriptionSQLite3.php
diff --git a/tests/Db/SQLite3/Database/TestDatabaseUserSQLite3.php b/tests/cases/Db/SQLite3/Database/TestDatabaseUserSQLite3.php
similarity index 100%
rename from tests/Db/SQLite3/Database/TestDatabaseUserSQLite3.php
rename to tests/cases/Db/SQLite3/Database/TestDatabaseUserSQLite3.php
diff --git a/tests/Db/SQLite3/TestDbDriverCreationSQLite3.php b/tests/cases/Db/SQLite3/TestDbDriverCreationSQLite3.php
similarity index 100%
rename from tests/Db/SQLite3/TestDbDriverCreationSQLite3.php
rename to tests/cases/Db/SQLite3/TestDbDriverCreationSQLite3.php
diff --git a/tests/Db/SQLite3/TestDbDriverSQLite3.php b/tests/cases/Db/SQLite3/TestDbDriverSQLite3.php
similarity index 100%
rename from tests/Db/SQLite3/TestDbDriverSQLite3.php
rename to tests/cases/Db/SQLite3/TestDbDriverSQLite3.php
diff --git a/tests/Db/SQLite3/TestDbResultSQLite3.php b/tests/cases/Db/SQLite3/TestDbResultSQLite3.php
similarity index 100%
rename from tests/Db/SQLite3/TestDbResultSQLite3.php
rename to tests/cases/Db/SQLite3/TestDbResultSQLite3.php
diff --git a/tests/Db/SQLite3/TestDbStatementSQLite3.php b/tests/cases/Db/SQLite3/TestDbStatementSQLite3.php
similarity index 100%
rename from tests/Db/SQLite3/TestDbStatementSQLite3.php
rename to tests/cases/Db/SQLite3/TestDbStatementSQLite3.php
diff --git a/tests/Db/SQLite3/TestDbUpdateSQLite3.php b/tests/cases/Db/SQLite3/TestDbUpdateSQLite3.php
similarity index 100%
rename from tests/Db/SQLite3/TestDbUpdateSQLite3.php
rename to tests/cases/Db/SQLite3/TestDbUpdateSQLite3.php
diff --git a/tests/Db/TestResultAggregate.php b/tests/cases/Db/TestResultAggregate.php
similarity index 100%
rename from tests/Db/TestResultAggregate.php
rename to tests/cases/Db/TestResultAggregate.php
diff --git a/tests/Db/TestResultEmpty.php b/tests/cases/Db/TestResultEmpty.php
similarity index 100%
rename from tests/Db/TestResultEmpty.php
rename to tests/cases/Db/TestResultEmpty.php
diff --git a/tests/Db/TestTransaction.php b/tests/cases/Db/TestTransaction.php
similarity index 100%
rename from tests/Db/TestTransaction.php
rename to tests/cases/Db/TestTransaction.php
diff --git a/tests/Exception/TestException.php b/tests/cases/Exception/TestException.php
similarity index 100%
rename from tests/Exception/TestException.php
rename to tests/cases/Exception/TestException.php
diff --git a/tests/Feed/TestFeed.php b/tests/cases/Feed/TestFeed.php
similarity index 100%
rename from tests/Feed/TestFeed.php
rename to tests/cases/Feed/TestFeed.php
diff --git a/tests/Feed/TestFeedFetching.php b/tests/cases/Feed/TestFeedFetching.php
similarity index 100%
rename from tests/Feed/TestFeedFetching.php
rename to tests/cases/Feed/TestFeedFetching.php
diff --git a/tests/Lang/TestLang.php b/tests/cases/Lang/TestLang.php
similarity index 100%
rename from tests/Lang/TestLang.php
rename to tests/cases/Lang/TestLang.php
diff --git a/tests/Lang/TestLangErrors.php b/tests/cases/Lang/TestLangErrors.php
similarity index 100%
rename from tests/Lang/TestLangErrors.php
rename to tests/cases/Lang/TestLangErrors.php
diff --git a/tests/Lang/testLangComplex.php b/tests/cases/Lang/testLangComplex.php
similarity index 100%
rename from tests/Lang/testLangComplex.php
rename to tests/cases/Lang/testLangComplex.php
diff --git a/tests/Misc/TestContext.php b/tests/cases/Misc/TestContext.php
similarity index 100%
rename from tests/Misc/TestContext.php
rename to tests/cases/Misc/TestContext.php
diff --git a/tests/Misc/TestValueInfo.php b/tests/cases/Misc/TestValueInfo.php
similarity index 100%
rename from tests/Misc/TestValueInfo.php
rename to tests/cases/Misc/TestValueInfo.php
diff --git a/tests/REST/NextCloudNews/TestNCNV1_2.php b/tests/cases/REST/NextCloudNews/TestNCNV1_2.php
similarity index 100%
rename from tests/REST/NextCloudNews/TestNCNV1_2.php
rename to tests/cases/REST/NextCloudNews/TestNCNV1_2.php
diff --git a/tests/REST/NextCloudNews/TestNCNVersionDiscovery.php b/tests/cases/REST/NextCloudNews/TestNCNVersionDiscovery.php
similarity index 100%
rename from tests/REST/NextCloudNews/TestNCNVersionDiscovery.php
rename to tests/cases/REST/NextCloudNews/TestNCNVersionDiscovery.php
diff --git a/tests/REST/TinyTinyRSS/TestTinyTinyAPI.php b/tests/cases/REST/TinyTinyRSS/TestTinyTinyAPI.php
similarity index 100%
rename from tests/REST/TinyTinyRSS/TestTinyTinyAPI.php
rename to tests/cases/REST/TinyTinyRSS/TestTinyTinyAPI.php
diff --git a/tests/REST/TinyTinyRSS/TestTinyTinyIcon.php b/tests/cases/REST/TinyTinyRSS/TestTinyTinyIcon.php
similarity index 100%
rename from tests/REST/TinyTinyRSS/TestTinyTinyIcon.php
rename to tests/cases/REST/TinyTinyRSS/TestTinyTinyIcon.php
diff --git a/tests/Service/TestService.php b/tests/cases/Service/TestService.php
similarity index 100%
rename from tests/Service/TestService.php
rename to tests/cases/Service/TestService.php
diff --git a/tests/User/TestAuthorization.php b/tests/cases/User/TestAuthorization.php
similarity index 100%
rename from tests/User/TestAuthorization.php
rename to tests/cases/User/TestAuthorization.php
diff --git a/tests/User/TestUserInternalDriver.php b/tests/cases/User/TestUserInternalDriver.php
similarity index 100%
rename from tests/User/TestUserInternalDriver.php
rename to tests/cases/User/TestUserInternalDriver.php
diff --git a/tests/User/TestUserMockExternal.php b/tests/cases/User/TestUserMockExternal.php
similarity index 100%
rename from tests/User/TestUserMockExternal.php
rename to tests/cases/User/TestUserMockExternal.php
diff --git a/tests/User/TestUserMockInternal.php b/tests/cases/User/TestUserMockInternal.php
similarity index 100%
rename from tests/User/TestUserMockInternal.php
rename to tests/cases/User/TestUserMockInternal.php
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 0e06627e..bcbdd479 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -29,64 +29,64 @@
 
 <testsuites>
     <testsuite name="Exceptions">
-        <file>Exception/TestException.php</file>
+        <file>cases/Exception/TestException.php</file>
     </testsuite>
     <testsuite name="Localization">
-        <file>Lang/TestLang.php</file>
-        <file>Lang/TestLangComplex.php</file>
-        <file>Lang/TestLangErrors.php</file>
+        <file>cases/Lang/TestLang.php</file>
+        <file>cases/Lang/TestLangComplex.php</file>
+        <file>cases/Lang/TestLangErrors.php</file>
     </testsuite>
     <testsuite name="Configuration">
-        <file>Conf/TestConf.php</file>
+        <file>cases/Conf/TestConf.php</file>
     </testsuite>
     <testsuite name="Sundry">
-        <file>Misc/TestValueInfo.php</file>
-        <file>Misc/TestContext.php</file>
+        <file>cases/Misc/TestValueInfo.php</file>
+        <file>cases/Misc/TestContext.php</file>
     </testsuite>
     <testsuite name="User management">
-        <file>User/TestUserMockInternal.php</file>
-        <file>User/TestUserMockExternal.php</file>
-        <file>User/TestUserInternalDriver.php</file>
-        <file>User/TestAuthorization.php</file>
+        <file>cases/User/TestUserMockInternal.php</file>
+        <file>cases/User/TestUserMockExternal.php</file>
+        <file>cases/User/TestUserInternalDriver.php</file>
+        <file>cases/User/TestAuthorization.php</file>
     </testsuite>
     <testsuite name="Feed parser">
-        <file>Feed/TestFeedFetching.php</file>
-        <file>Feed/TestFeed.php</file>
+        <file>cases/Feed/TestFeedFetching.php</file>
+        <file>cases/Feed/TestFeed.php</file>
     </testsuite>
     <testsuite name="Database drivers">
-        <file>Db/TestTransaction.php</file>
-        <file>Db/TestResultAggregate.php</file>
-        <file>Db/TestResultEmpty.php</file>
-        <file>Db/SQLite3/TestDbResultSQLite3.php</file>
-        <file>Db/SQLite3/TestDbStatementSQLite3.php</file>
-        <file>Db/SQLite3/TestDbDriverCreationSQLite3.php</file>
-        <file>Db/SQLite3/TestDbDriverSQLite3.php</file>
-        <file>Db/SQLite3/TestDbUpdateSQLite3.php</file>
+        <file>cases/Db/TestTransaction.php</file>
+        <file>cases/Db/TestResultAggregate.php</file>
+        <file>cases/Db/TestResultEmpty.php</file>
+        <file>cases/Db/SQLite3/TestDbResultSQLite3.php</file>
+        <file>cases/Db/SQLite3/TestDbStatementSQLite3.php</file>
+        <file>cases/Db/SQLite3/TestDbDriverCreationSQLite3.php</file>
+        <file>cases/Db/SQLite3/TestDbDriverSQLite3.php</file>
+        <file>cases/Db/SQLite3/TestDbUpdateSQLite3.php</file>
     </testsuite>
     <testsuite name="Database functions">
-        <file>Db/SQLite3/Database/TestDatabaseMiscellanySQLite3.php</file>
-        <file>Db/SQLite3/Database/TestDatabaseMetaSQLite3.php</file>
-        <file>Db/SQLite3/Database/TestDatabaseUserSQLite3.php</file>
-        <file>Db/SQLite3/Database/TestDatabaseSessionSQLite3.php</file>
-        <file>Db/SQLite3/Database/TestDatabaseFolderSQLite3.php</file>
-        <file>Db/SQLite3/Database/TestDatabaseFeedSQLite3.php</file>
-        <file>Db/SQLite3/Database/TestDatabaseSubscriptionSQLite3.php</file>
-        <file>Db/SQLite3/Database/TestDatabaseArticleSQLite3.php</file>
-        <file>Db/SQLite3/Database/TestDatabaseLabelSQLite3.php</file>
-        <file>Db/SQLite3/Database/TestDatabaseCleanupSQLite3.php</file>
+        <file>cases/Db/SQLite3/Database/TestDatabaseMiscellanySQLite3.php</file>
+        <file>cases/Db/SQLite3/Database/TestDatabaseMetaSQLite3.php</file>
+        <file>cases/Db/SQLite3/Database/TestDatabaseUserSQLite3.php</file>
+        <file>cases/Db/SQLite3/Database/TestDatabaseSessionSQLite3.php</file>
+        <file>cases/Db/SQLite3/Database/TestDatabaseFolderSQLite3.php</file>
+        <file>cases/Db/SQLite3/Database/TestDatabaseFeedSQLite3.php</file>
+        <file>cases/Db/SQLite3/Database/TestDatabaseSubscriptionSQLite3.php</file>
+        <file>cases/Db/SQLite3/Database/TestDatabaseArticleSQLite3.php</file>
+        <file>cases/Db/SQLite3/Database/TestDatabaseLabelSQLite3.php</file>
+        <file>cases/Db/SQLite3/Database/TestDatabaseCleanupSQLite3.php</file>
     </testsuite>
     <testsuite name="Controllers">
         <testsuite name="NCNv1">
-            <file>REST/NextCloudNews/TestNCNVersionDiscovery.php</file>
-            <file>REST/NextCloudNews/TestNCNV1_2.php</file>
+            <file>cases/REST/NextCloudNews/TestNCNVersionDiscovery.php</file>
+            <file>cases/REST/NextCloudNews/TestNCNV1_2.php</file>
         </testsuite>
         <testsuite name="TTRSS">
-            <file>REST/TinyTinyRSS/TestTinyTinyAPI.php</file>
-            <file>REST/TinyTinyRSS/TestTinyTinyIcon.php</file>
+            <file>cases/REST/TinyTinyRSS/TestTinyTinyAPI.php</file>
+            <file>cases/REST/TinyTinyRSS/TestTinyTinyIcon.php</file>
         </testsuite>
     </testsuite>
     <testsuite name="Refresh service">
-        <file>Service/TestService.php</file>
+        <file>cases/Service/TestService.php</file>
     </testsuite>
 </testsuites>
 </phpunit>
\ No newline at end of file