diff --git a/tests/e2e/Services/Sites/SitesBase.php b/tests/e2e/Services/Sites/SitesBase.php
index d19f20b24d..277064ead5 100644
--- a/tests/e2e/Services/Sites/SitesBase.php
+++ b/tests/e2e/Services/Sites/SitesBase.php
@@ -6,6 +6,7 @@ use Appwrite\Tests\Async;
 use CURLFile;
 use Tests\E2E\Client;
 use Utopia\CLI\Console;
+use Utopia\Database\Query;
 
 trait SitesBase
 {
@@ -215,4 +216,26 @@ trait SitesBase
 
         return $site;
     }
+
+    protected function getSiteDomain(string $siteId): string
+    {
+        $rules = $this->client->call(Client::METHOD_GET, '/proxy/rules', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [
+                Query::equal('resourceId', [$siteId])->toString(),
+                Query::equal('resourceType', ['site'])->toString(),
+            ],
+        ]);
+
+        $this->assertEquals(200, $rules['headers']['status-code']);
+        $this->assertGreaterThanOrEqual(1, $rules['body']['total']);
+        $this->assertGreaterThanOrEqual(1, \count($rules['body']['rules']));
+        $this->assertNotEmpty($rules['body']['rules'][0]['domain']);
+
+        $domain = $rules['body']['rules'][0]['domain'];
+
+        return $domain;
+    }
 }
diff --git a/tests/e2e/Services/Sites/SitesCustomServerTest.php b/tests/e2e/Services/Sites/SitesCustomServerTest.php
index 86ed333c46..e91df25f69 100644
--- a/tests/e2e/Services/Sites/SitesCustomServerTest.php
+++ b/tests/e2e/Services/Sites/SitesCustomServerTest.php
@@ -918,27 +918,16 @@ class SitesCustomServerTest extends Scope
             'fallbackFile' => '',
         ]);
 
+        $this->assertNotEmpty($siteId);
+
         $deploymentId = $this->setupDeployment($siteId, [
             'code' => $this->packageSite('static-spa'),
             'activate' => 'true'
         ]);
 
-        $rules = $this->client->call(Client::METHOD_GET, '/proxy/rules', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'queries' => [
-                Query::equal('resourceId', [$siteId])->toString(),
-                Query::equal('resourceType', ['site'])->toString(),
-            ],
-        ]);
+        $this->assertNotEmpty($deploymentId);
 
-        $this->assertEquals(200, $rules['headers']['status-code']);
-        $this->assertEquals(1, $rules['body']['total']);
-        $this->assertCount(1, $rules['body']['rules']);
-        $this->assertNotEmpty($rules['body']['rules'][0]['domain']);
-
-        $domain = $rules['body']['rules'][0]['domain'];
+        $domain = $this->getSiteDomain($siteId);
 
         $proxyClient = new Client();
         $proxyClient->setEndpoint('http://' . $domain);
@@ -986,27 +975,16 @@ class SitesCustomServerTest extends Scope
             'fallbackFile' => '404.html',
         ]);
 
+        $this->assertNotEmpty($siteId);
+
         $deploymentId = $this->setupDeployment($siteId, [
             'code' => $this->packageSite('static-spa'),
             'activate' => 'true'
         ]);
 
-        $rules = $this->client->call(Client::METHOD_GET, '/proxy/rules', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'queries' => [
-                Query::equal('resourceId', [$siteId])->toString(),
-                Query::equal('resourceType', ['site'])->toString(),
-            ],
-        ]);
-
-        $this->assertEquals(200, $rules['headers']['status-code']);
-        $this->assertEquals(1, $rules['body']['total']);
-        $this->assertCount(1, $rules['body']['rules']);
-        $this->assertNotEmpty($rules['body']['rules'][0]['domain']);
-
-        $domain = $rules['body']['rules'][0]['domain'];
+        $this->assertNotEmpty($deploymentId);
+        
+        $domain = $this->getSiteDomain($siteId);
 
         $proxyClient = new Client();
         $proxyClient->setEndpoint('http://' . $domain);