diff --git a/phpunit.xml b/phpunit.xml
index 53dac2e0a3..ad38850ddf 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -6,6 +6,7 @@
          colors="true"
          processIsolation="false"
          stopOnFailure="true"
+         stopOnError="true"
          cacheDirectory=".phpunit.cache"
 >
     <extensions>
diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php
index b7db9dea78..62a0a1b224 100644
--- a/tests/e2e/Services/Databases/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/DatabasesBase.php
@@ -3551,13 +3551,13 @@ trait DatabasesBase
         ]);
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertArrayHasKey('$sequence', $response['body']['documents'][0]);
-        $this->assertArrayHasKey('$id', $response['body']['documents'][0]);
-        $this->assertArrayHasKey('$createdAt', $response['body']['documents'][0]);
-        $this->assertArrayHasKey('$updatedAt', $response['body']['documents'][0]);
-        $this->assertArrayHasKey('$permissions', $response['body']['documents'][0]);
-        $this->assertArrayHasKey('title', $response['body']['documents'][0]);
-        $this->assertArrayNotHasKey('birthDay', $response['body']['documents'][0]);
+        $this->assertArrayHasKey('$sequence', $response['body'][$this->getRecordResource()][0]);
+        $this->assertArrayHasKey('$id', $response['body'][$this->getRecordResource()][0]);
+        $this->assertArrayHasKey('$createdAt', $response['body'][$this->getRecordResource()][0]);
+        $this->assertArrayHasKey('$updatedAt', $response['body'][$this->getRecordResource()][0]);
+        $this->assertArrayHasKey('$permissions', $response['body'][$this->getRecordResource()][0]);
+        $this->assertArrayHasKey('title', $response['body'][$this->getRecordResource()][0]);
+        $this->assertArrayNotHasKey('birthDay', $response['body'][$this->getRecordResource()][0]);
     }
 
     public function testListDocumentsAfterPagination(): void