diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php
index 6c42a41859..1d90668b76 100644
--- a/tests/e2e/Services/Databases/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/DatabasesBase.php
@@ -914,12 +914,12 @@ trait DatabasesBase
 
         $relationship = null;
         if ($this->getSupportForRelationships()) {
-            $relationship = $this->client->call(Client::METHOD_POST, $this->getSchemaUrl($databaseId, $data['moviesId']) . '/relationship', array_merge([
+            $relationship = $this->client->call(Client::METHOD_POST, $this->getSchemaUrl($databaseId, $moviesId) . '/relationship', array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey']
             ]), [
-                $this->getRelatedIdParam() => $data['actorsId'],
+                $this->getRelatedIdParam() => $actorsId,
                 'type' => 'oneToMany',
                 'twoWay' => true,
                 'key' => 'starringActors',
@@ -3030,7 +3030,7 @@ trait DatabasesBase
         }
     }
 
-    public function testListDocuments(): array
+    public function testListDocuments(): void
     {
         $data = $this->setupDocuments();
         $databaseId = $data['databaseId'];
@@ -5364,6 +5364,11 @@ trait DatabasesBase
         // that may add duplicate titles to the shared movies collection in the same process
         $data = $this->setupDatabase();
         $databaseId = $data['databaseId'];
+        $serverHeaders = [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey'],
+        ];
 
         // Create a dedicated collection for unique index testing
         $collection = $this->client->call(Client::METHOD_POST, $this->getContainerUrl($databaseId), $serverHeaders, [
@@ -6414,6 +6419,8 @@ trait DatabasesBase
             return;
         }
 
+        $data = $this->setupOneToManyRelationship();
+
         $response = $this->client->call(Client::METHOD_GET, $this->getRecordUrl($data['databaseId'], $data['personCollection']), array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -6459,6 +6466,8 @@ trait DatabasesBase
             return;
         }
 
+        $data = $this->setupOneToManyRelationship();
+
         $response = $this->client->call(Client::METHOD_GET, $this->getRecordUrl($data['databaseId'], $data['personCollection']), array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
diff --git a/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php b/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php
index e0f9216b65..3907e3010e 100644
--- a/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php
+++ b/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php
@@ -294,6 +294,36 @@ class RealtimeConsoleClientTest extends Scope
 
     public function testAttributesCollectionsAPI(): void
     {
+        /**
+         * Create database and collection BEFORE opening WebSocket
+         * to avoid their creation events interfering with attribute events.
+         */
+        $database = $this->client->call(Client::METHOD_POST, '/databases', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'databaseId' => ID::unique(),
+            'name' => 'Actors DB',
+        ]);
+
+        $databaseId = $database['body']['$id'];
+
+        $actors = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'collectionId' => ID::unique(),
+            'name' => 'Actors',
+            'permissions' => [
+                Permission::read(Role::any()),
+                Permission::create(Role::any()),
+                Permission::update(Role::any()),
+                Permission::delete(Role::any()),
+            ],
+        ]);
+
+        $actorsId = $actors['body']['$id'];
+
         $projectId = 'console';
 
         $client = $this->getWebsocket(['console'], [
@@ -311,37 +341,9 @@ class RealtimeConsoleClientTest extends Scope
         $this->assertContains('console', $response['data']['channels']);
         $this->assertNotEmpty($response['data']['user']);
 
-        /**
-         * Create database
-         */
-        $database = $this->client->call(Client::METHOD_POST, '/databases', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'databaseId' => ID::unique(),
-            'name' => 'Actors DB',
-        ]);
-
-        $databaseId = $database['body']['$id'];
         /**
          * Test Attributes
          */
-        $actors = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'collectionId' => ID::unique(),
-            'name' => 'Actors',
-            'permissions' => [
-                Permission::read(Role::any()),
-                Permission::create(Role::any()),
-                Permission::update(Role::any()),
-                Permission::delete(Role::any()),
-            ],
-        ]);
-
-        $actorsId = $actors['body']['$id'];
-
         $name = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $actorsId . '/attributes/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -406,6 +408,36 @@ class RealtimeConsoleClientTest extends Scope
 
     public function testAttributesTablesAPI(): void
     {
+        /**
+         * Create database and table BEFORE opening WebSocket
+         * to avoid their creation events interfering with column events.
+         */
+        $database = $this->client->call(Client::METHOD_POST, '/databases', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'databaseId' => ID::unique(),
+            'name' => 'Actors DB',
+        ]);
+
+        $databaseId = $database['body']['$id'];
+
+        $actors = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'tableId' => ID::unique(),
+            'name' => 'Actors',
+            'permissions' => [
+                Permission::read(Role::any()),
+                Permission::create(Role::any()),
+                Permission::update(Role::any()),
+                Permission::delete(Role::any()),
+            ],
+        ]);
+
+        $actorsId = $actors['body']['$id'];
+
         $projectId = 'console';
 
         $client = $this->getWebsocket(['console'], [
@@ -423,38 +455,9 @@ class RealtimeConsoleClientTest extends Scope
         $this->assertContains('console', $response['data']['channels']);
         $this->assertNotEmpty($response['data']['user']);
 
-        /**
-         * Create database
-         */
-        $database = $this->client->call(Client::METHOD_POST, '/databases', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'databaseId' => ID::unique(),
-            'name' => 'Actors DB',
-        ]);
-
-        $databaseId = $database['body']['$id'];
-
         /**
          * Test Attributes
          */
-        $actors = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'tableId' => ID::unique(),
-            'name' => 'Actors',
-            'permissions' => [
-                Permission::read(Role::any()),
-                Permission::create(Role::any()),
-                Permission::update(Role::any()),
-                Permission::delete(Role::any()),
-            ],
-        ]);
-
-        $actorsId = $actors['body']['$id'];
-
         $name = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $actorsId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],