diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index cf1e55f7ec..766b295fff 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -145,7 +145,7 @@ jobs:
           Account,
           Avatars,
           Console,
-          Databases/Collections,
+          Databases/Legacy,
           Databases/Tables,
           Functions,
           FunctionsSchedule,
@@ -214,7 +214,7 @@ jobs:
             Account,
             Avatars,
             Console,
-            Databases/Collections,
+            Databases/Legacy,
             Databases/Tables,
             Functions,
             FunctionsSchedule,
diff --git a/tests/e2e/Services/Databases/Collections/DatabasesBase.php b/tests/e2e/Services/Databases/Legacy/DatabasesBase.php
similarity index 99%
rename from tests/e2e/Services/Databases/Collections/DatabasesBase.php
rename to tests/e2e/Services/Databases/Legacy/DatabasesBase.php
index 6b0aca1512..69b24d5052 100644
--- a/tests/e2e/Services/Databases/Collections/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/Legacy/DatabasesBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\E2E\Services\Databases\Collections;
+namespace Tests\E2E\Services\Databases\Legacy;
 
 use Appwrite\Extend\Exception;
 use Tests\E2E\Client;
diff --git a/tests/e2e/Services/Databases/Collections/DatabasesConsoleClientTest.php b/tests/e2e/Services/Databases/Legacy/DatabasesConsoleClientTest.php
similarity index 99%
rename from tests/e2e/Services/Databases/Collections/DatabasesConsoleClientTest.php
rename to tests/e2e/Services/Databases/Legacy/DatabasesConsoleClientTest.php
index 64cade4f9d..e81730411b 100644
--- a/tests/e2e/Services/Databases/Collections/DatabasesConsoleClientTest.php
+++ b/tests/e2e/Services/Databases/Legacy/DatabasesConsoleClientTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\E2E\Services\Databases\Collections;
+namespace Tests\E2E\Services\Databases\Legacy;
 
 use Tests\E2E\Client;
 use Tests\E2E\Scopes\ProjectCustom;
diff --git a/tests/e2e/Services/Databases/Collections/DatabasesCustomClientTest.php b/tests/e2e/Services/Databases/Legacy/DatabasesCustomClientTest.php
similarity index 99%
rename from tests/e2e/Services/Databases/Collections/DatabasesCustomClientTest.php
rename to tests/e2e/Services/Databases/Legacy/DatabasesCustomClientTest.php
index 6c91c45446..699a2b8f25 100644
--- a/tests/e2e/Services/Databases/Collections/DatabasesCustomClientTest.php
+++ b/tests/e2e/Services/Databases/Legacy/DatabasesCustomClientTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\E2E\Services\Databases\Collections;
+namespace Tests\E2E\Services\Databases\Legacy;
 
 use Tests\E2E\Client;
 use Tests\E2E\Scopes\ProjectCustom;
diff --git a/tests/e2e/Services/Databases/Collections/DatabasesCustomServerTest.php b/tests/e2e/Services/Databases/Legacy/DatabasesCustomServerTest.php
similarity index 99%
rename from tests/e2e/Services/Databases/Collections/DatabasesCustomServerTest.php
rename to tests/e2e/Services/Databases/Legacy/DatabasesCustomServerTest.php
index bb17cfdbcb..9b2ff2403c 100644
--- a/tests/e2e/Services/Databases/Collections/DatabasesCustomServerTest.php
+++ b/tests/e2e/Services/Databases/Legacy/DatabasesCustomServerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\E2E\Services\Databases\Collections;
+namespace Tests\E2E\Services\Databases\Legacy;
 
 use Appwrite\Extend\Exception as AppwriteException;
 use Tests\E2E\Client;
diff --git a/tests/e2e/Services/Databases/Collections/DatabasesPermissionsGuestTest.php b/tests/e2e/Services/Databases/Legacy/DatabasesPermissionsGuestTest.php
similarity index 99%
rename from tests/e2e/Services/Databases/Collections/DatabasesPermissionsGuestTest.php
rename to tests/e2e/Services/Databases/Legacy/DatabasesPermissionsGuestTest.php
index d05c944391..abeef6c222 100644
--- a/tests/e2e/Services/Databases/Collections/DatabasesPermissionsGuestTest.php
+++ b/tests/e2e/Services/Databases/Legacy/DatabasesPermissionsGuestTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\E2E\Services\Databases\Collections;
+namespace Tests\E2E\Services\Databases\Legacy;
 
 use Tests\E2E\Client;
 use Tests\E2E\Scopes\ProjectCustom;
diff --git a/tests/e2e/Services/Databases/Collections/DatabasesPermissionsMemberTest.php b/tests/e2e/Services/Databases/Legacy/DatabasesPermissionsMemberTest.php
similarity index 99%
rename from tests/e2e/Services/Databases/Collections/DatabasesPermissionsMemberTest.php
rename to tests/e2e/Services/Databases/Legacy/DatabasesPermissionsMemberTest.php
index e8065501fe..2e37da867f 100644
--- a/tests/e2e/Services/Databases/Collections/DatabasesPermissionsMemberTest.php
+++ b/tests/e2e/Services/Databases/Legacy/DatabasesPermissionsMemberTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\E2E\Services\Databases\Collections;
+namespace Tests\E2E\Services\Databases\Legacy;
 
 use Tests\E2E\Client;
 use Tests\E2E\Scopes\ProjectCustom;
diff --git a/tests/e2e/Services/Databases/Collections/DatabasesPermissionsScope.php b/tests/e2e/Services/Databases/Legacy/DatabasesPermissionsScope.php
similarity index 98%
rename from tests/e2e/Services/Databases/Collections/DatabasesPermissionsScope.php
rename to tests/e2e/Services/Databases/Legacy/DatabasesPermissionsScope.php
index 9d46dda5c6..597562dab8 100644
--- a/tests/e2e/Services/Databases/Collections/DatabasesPermissionsScope.php
+++ b/tests/e2e/Services/Databases/Legacy/DatabasesPermissionsScope.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\E2E\Services\Databases\Collections;
+namespace Tests\E2E\Services\Databases\Legacy;
 
 use Tests\E2E\Client;
 
diff --git a/tests/e2e/Services/Databases/Collections/DatabasesPermissionsTeamTest.php b/tests/e2e/Services/Databases/Legacy/DatabasesPermissionsTeamTest.php
similarity index 99%
rename from tests/e2e/Services/Databases/Collections/DatabasesPermissionsTeamTest.php
rename to tests/e2e/Services/Databases/Legacy/DatabasesPermissionsTeamTest.php
index d3c0556557..bc8b4f9a5e 100644
--- a/tests/e2e/Services/Databases/Collections/DatabasesPermissionsTeamTest.php
+++ b/tests/e2e/Services/Databases/Legacy/DatabasesPermissionsTeamTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\E2E\Services\Databases\Collections;
+namespace Tests\E2E\Services\Databases\Legacy;
 
 use Tests\E2E\Client;
 use Tests\E2E\Scopes\ProjectCustom;