diff --git a/tests/e2e/Services/Messaging/MessagingBase.php b/tests/e2e/Services/Messaging/MessagingBase.php
index 94b533295e..6eb16a0f3b 100644
--- a/tests/e2e/Services/Messaging/MessagingBase.php
+++ b/tests/e2e/Services/Messaging/MessagingBase.php
@@ -290,7 +290,7 @@ trait MessagingBase
             'x-appwrite-key' => $this->getProject()['apiKey'],
         ], [
             'queries' => [
-                'equal("total", [0])'
+                Query::equal('total', [0])->toString(),
             ],
         ]);
 
@@ -303,7 +303,7 @@ trait MessagingBase
             'x-appwrite-key' => $this->getProject()['apiKey'],
         ], [
             'queries' => [
-                'greaterThan("total", 0)'
+                Query::greaterThan('total', 0)->toString(),
             ],
         ]);
 
@@ -555,7 +555,7 @@ trait MessagingBase
             'x-appwrite-key' => $this->getProject()['apiKey'],
         ], [
             'queries' => [
-                '{"method":"cursorAsc","attribute":"$id","values":[]}'
+                '{ "method": "cursorAsc", "attribute": "$id" }'
             ]
         ]);
 
diff --git a/tests/e2e/Services/Messaging/MessagingConsoleClientTest.php b/tests/e2e/Services/Messaging/MessagingConsoleClientTest.php
index 40fc66a3f6..94080fcf49 100644
--- a/tests/e2e/Services/Messaging/MessagingConsoleClientTest.php
+++ b/tests/e2e/Services/Messaging/MessagingConsoleClientTest.php
@@ -157,7 +157,9 @@ class MessagingConsoleClientTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => ['{"method":"cursorAsc","attribute":"$id","values":[]}']
+            'queries' => [
+                '{ "method": "cursorAsc", "attribute":"$id" }'
+            ]
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 400);