diff --git a/tests/e2e/Services/GraphQL/GraphQLFunctionsClientTest.php b/tests/e2e/Services/GraphQL/GraphQLFunctionsClientTest.php
new file mode 100644
index 0000000000..03173c1745
--- /dev/null
+++ b/tests/e2e/Services/GraphQL/GraphQLFunctionsClientTest.php
@@ -0,0 +1,211 @@
+<?php
+
+namespace Tests\E2E\Services\GraphQL;
+
+use Tests\E2E\Client;
+use Tests\E2E\Scopes\ProjectCustom;
+use Tests\E2E\Scopes\Scope;
+use Tests\E2E\Scopes\SideClient;
+use Tests\E2E\Scopes\SideServer;
+
+class GraphQLFunctionsClientTest extends Scope
+{
+    use ProjectCustom;
+    use SideClient;
+    use GraphQLBase;
+
+    public function testCreateFunction(): array
+    {
+        $projectId = $this->getProject()['$id'];
+        $query = $this->getQuery(self::$CREATE_FUNCTION);
+        $gqlPayload = [
+            'query' => $query,
+            'variables' => [
+                'functionId' => 'unique()',
+                'name' => 'Test Function',
+                'runtime' => 'ruby-3.0',
+                'execute' => ['role:all'],
+                'vars' => [
+                    'name' => 'John Doe',
+                    'age' => 42,
+                ]
+            ]
+        ];
+
+        $function = $this->client->call(Client::METHOD_POST, '/graphql', [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $projectId,
+            'x-appwrite-key' => $this->getProject()['apiKey'],
+        ], $gqlPayload);
+
+        $this->assertIsArray($function['body']['data']);
+        $this->assertArrayNotHasKey('errors', $function['body']);
+
+        return $function['body']['data']['functionsCreate'];
+    }
+
+    /**
+     * @depends testCreateFunction
+     * @param $function
+     * @return array
+     * @throws \Exception
+     */
+    public function testCreateDeployment($function): array
+    {
+        $projectId = $this->getProject()['$id'];
+        $query = $this->getQuery(self::$CREATE_DEPLOYMENT);
+        $gqlPayload = [
+            'query' => $query,
+            'variables' => [
+                'functionId' => $function['_id'],
+                'entrypoint' => 'main.rb',
+                'code' => realpath(__DIR__ . '/../../../resources/functions') . "/ruby/code.tar.gz",
+                'activate' => true,
+            ]
+        ];
+
+        $deployment = $this->client->call(Client::METHOD_POST, '/graphql', [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $projectId,
+            'x-appwrite-key' => $this->getProject()['apiKey'],
+        ], $gqlPayload);
+
+        $this->assertIsArray($deployment['body']['data']);
+        $this->assertArrayNotHasKey('errors', $deployment['body']);
+        $deployment = $deployment['body']['data']['functionsCreateDeployment'];
+        $this->assertEquals('actor.json', $deployment['deploymentId']);
+
+        return $deployment;
+    }
+
+    /**
+     * @depends testCreateFunction
+     * @depends testCreateDeployment
+     * @param $function
+     * @param $deployment
+     * @return array
+     * @throws \Exception
+     */
+    public function testCreateExecution($function, $deployment): array
+    {
+        $projectId = $this->getProject()['$id'];
+        $query = $this->getQuery(self::$CREATE_EXECUTION);
+        $gqlPayload = [
+            'query' => $query,
+            'variables' => [
+                'functionId' => $function['_id'],
+            ]
+        ];
+
+        $execution = $this->client->call(Client::METHOD_POST, '/graphql', \array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $projectId,
+        ], $this->getHeaders()), $gqlPayload);
+
+        $this->assertIsArray($execution['body']['data']);
+        $this->assertArrayNotHasKey('errors', $execution['body']);
+        $execution = $execution['body']['data']['functionsCreateExecution'];
+        $this->assertEquals('actor.json', $execution['executionId']);
+
+        return $execution;
+    }
+
+    /**
+     * @depends testCreateFunction
+     * @depends testCreateDeployment
+     * @depends testCreateExecution
+     * @param $function
+     * @param $deployment
+     * @param $execution
+     * @return array
+     * @throws \Exception
+     */
+    public function testCreateRetryBuild($function, $deployment, $execution): array
+    {
+        $projectId = $this->getProject()['$id'];
+        $query = $this->getQuery(self::$RETRY_BUILD);
+        $gqlPayload = [
+            'query' => $query,
+            'variables' => [
+                'functionId' => $function['_id'],
+                'deploymentId' => $deployment['deploymentId'],
+                'buildId' => $execution['executionId'],
+            ]
+        ];
+
+        $retryBuild = $this->client->call(Client::METHOD_POST, '/graphql', \array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $projectId,
+        ], $this->getHeaders()), $gqlPayload);
+
+        $this->assertIsArray($retryBuild['body']['data']);
+        $this->assertArrayNotHasKey('errors', $retryBuild['body']);
+        $retryBuild = $retryBuild['body']['data']['functionsRetryBuild'];
+        $this->assertIsArray($retryBuild);
+
+        return $retryBuild;
+    }
+
+    /**
+     * @depends testCreateFunction
+     * @param $function
+     * @return array
+     * @throws \Exception
+     */
+    public function testGetExecutions($function): array
+    {
+        $projectId = $this->getProject()['$id'];
+        $query = $this->getQuery(self::$GET_EXECUTIONS);
+        $gqlPayload = [
+            'query' => $query,
+            'variables' => [
+                'functionId' => $function['_id'],
+            ]
+        ];
+
+        $executions = $this->client->call(Client::METHOD_POST, '/graphql', \array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $projectId,
+        ], $this->getHeaders()), $gqlPayload);
+
+        $this->assertIsArray($executions['body']['data']);
+        $this->assertArrayNotHasKey('errors', $executions['body']);
+        $executions = $executions['body']['data']['functionsListExecutions'];
+        $this->assertIsArray($executions);
+
+        return $executions;
+    }
+
+    /**
+     * @depends testCreateFunction
+     * @depends testCreateExecution
+     * @param $function
+     * @param $execution
+     * @return array
+     * @throws \Exception
+     */
+    public function testGetExecution($function, $execution): array
+    {
+        $projectId = $this->getProject()['$id'];
+        $query = $this->getQuery(self::$GET_EXECUTION);
+        $gqlPayload = [
+            'query' => $query,
+            'variables' => [
+                'functionId' => $function['_id'],
+                'executionId' => $execution['_id'],
+            ]
+        ];
+
+        $execution = $this->client->call(Client::METHOD_POST, '/graphql', \array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $projectId,
+        ], $this->getHeaders()), $gqlPayload);
+
+        $this->assertIsArray($execution['body']['data']);
+        $this->assertArrayNotHasKey('errors', $execution['body']);
+        $execution = $execution['body']['data']['functionsGetExecution'];
+        $this->assertIsArray($execution);
+
+        return $execution;
+    }
+}
\ No newline at end of file
diff --git a/tests/e2e/Services/GraphQL/GraphQLFunctionsServerTest.php b/tests/e2e/Services/GraphQL/GraphQLFunctionsServerTest.php
index 8ea0d55a01..8a658d72ad 100644
--- a/tests/e2e/Services/GraphQL/GraphQLFunctionsServerTest.php
+++ b/tests/e2e/Services/GraphQL/GraphQLFunctionsServerTest.php
@@ -69,6 +69,8 @@ class GraphQLFunctionsServerTest extends Scope
             'x-appwrite-project' => $projectId,
         ], $this->getHeaders()), $gqlPayload);
 
+        \var_dump($deployment);
+
         $this->assertIsArray($deployment['body']['data']);
         $this->assertArrayNotHasKey('errors', $deployment['body']);
         $deployment = $deployment['body']['data']['functionsCreateDeployment'];
@@ -122,7 +124,7 @@ class GraphQLFunctionsServerTest extends Scope
     public function testCreateRetryBuild($function): array
     {
         $projectId = $this->getProject()['$id'];
-        $query = $this->getQuery(self::$CREATE_RETRY_BUILD);
+        $query = $this->getQuery(self::$RETRY_BUILD);
         $gqlPayload = [
             'query' => $query,
             'variables' => [
@@ -336,8 +338,6 @@ class GraphQLFunctionsServerTest extends Scope
             'x-appwrite-project' => $projectId,
         ], $this->getHeaders()), $gqlPayload);
 
-        \var_dump($function);
-
         $this->assertIsArray($function['body']['data']);
         $this->assertArrayNotHasKey('errors', $function['body']);
         $function = $function['body']['data']['functionsUpdate'];
@@ -368,7 +368,7 @@ class GraphQLFunctionsServerTest extends Scope
             'x-appwrite-project' => $projectId,
         ], $this->getHeaders()), $gqlPayload);
 
-        $this->assertEquals(204, $response['headers']['status-code']);
+        $this->assertEquals(200, $response['headers']['status-code']);
     }
 
     /**