diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index e921c0dcc7..06b8b139e5 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -382,7 +382,7 @@ function updateAttribute(
 }
 
 App::init()
-    ->groups(['database'])
+    ->groups(['database', 'function', 'storage', 'messaging'])
     ->inject('project')
     ->action(function (Document $project) {
         if ($project->getId() === 'console') {
diff --git a/phpunit.xml b/phpunit.xml
index 90ebd4225f..e772866051 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -6,7 +6,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
+         stopOnFailure="true"
 >
     <extensions>
         <extension class="Appwrite\Tests\TestHook" />