diff --git a/tests/e2e/Services/Databases/Legacy/Transactions/TransactionsTest.php b/tests/e2e/Services/Databases/Legacy/Transactions/TransactionsBase.php
similarity index 99%
rename from tests/e2e/Services/Databases/Legacy/Transactions/TransactionsTest.php
rename to tests/e2e/Services/Databases/Legacy/Transactions/TransactionsBase.php
index a76d909b5e..f05563123c 100644
--- a/tests/e2e/Services/Databases/Legacy/Transactions/TransactionsTest.php
+++ b/tests/e2e/Services/Databases/Legacy/Transactions/TransactionsBase.php
@@ -3,19 +3,13 @@
 namespace Tests\E2E\Services\Databases\Legacy\Transactions;
 
 use Tests\E2E\Client;
-use Tests\E2E\Scopes\ProjectCustom;
-use Tests\E2E\Scopes\Scope;
-use Tests\E2E\Scopes\SideClient;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
 
-class TransactionsTest extends Scope
+trait TransactionsBase
 {
-    use ProjectCustom;
-    use SideClient;
-
     /**
      * Test creating a transaction
      */
diff --git a/tests/e2e/Services/Databases/Legacy/Transactions/TransactionsConsoleClientTest.php b/tests/e2e/Services/Databases/Legacy/Transactions/TransactionsConsoleClientTest.php
new file mode 100644
index 0000000000..427e79fb3a
--- /dev/null
+++ b/tests/e2e/Services/Databases/Legacy/Transactions/TransactionsConsoleClientTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Tests\E2E\Services\Databases\Legacy\Transactions;
+
+use Tests\E2E\Scopes\ProjectCustom;
+use Tests\E2E\Scopes\SideConsole;
+
+class TransactionsConsoleClientTest
+{
+    use TransactionsBase;
+    use ProjectCustom;
+    use SideConsole;
+}
diff --git a/tests/e2e/Services/Databases/Legacy/Transactions/TransactionsCustomClientTest.php b/tests/e2e/Services/Databases/Legacy/Transactions/TransactionsCustomClientTest.php
new file mode 100644
index 0000000000..3ee685d778
--- /dev/null
+++ b/tests/e2e/Services/Databases/Legacy/Transactions/TransactionsCustomClientTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Tests\E2E\Services\Databases\Legacy\Transactions;
+
+use Tests\E2E\Scopes\ProjectCustom;
+use Tests\E2E\Scopes\SideClient;
+
+class TransactionsCustomClientTest
+{
+    use TransactionsBase;
+    use ProjectCustom;
+    use SideClient;
+}
diff --git a/tests/e2e/Services/Databases/Legacy/Transactions/TransactionsCustomServerTest.php b/tests/e2e/Services/Databases/Legacy/Transactions/TransactionsCustomServerTest.php
new file mode 100644
index 0000000000..425f731ef3
--- /dev/null
+++ b/tests/e2e/Services/Databases/Legacy/Transactions/TransactionsCustomServerTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Tests\E2E\Services\Databases\Legacy\Transactions;
+
+use Tests\E2E\Scopes\ProjectCustom;
+use Tests\E2E\Scopes\SideServer;
+
+class TransactionsCustomServerTest
+{
+    use TransactionsBase;
+    use ProjectCustom;
+    use SideServer;
+}
diff --git a/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsTest.php b/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsBase.php
similarity index 99%
rename from tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsTest.php
rename to tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsBase.php
index 910b675afc..4e264e8641 100644
--- a/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsTest.php
+++ b/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsBase.php
@@ -3,19 +3,13 @@
 namespace Tests\E2E\Services\Databases\TablesDB\Transactions;
 
 use Tests\E2E\Client;
-use Tests\E2E\Scopes\ProjectCustom;
-use Tests\E2E\Scopes\Scope;
-use Tests\E2E\Scopes\SideClient;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
 
-class TransactionsTest extends Scope
+trait TransactionsBase
 {
-    use ProjectCustom;
-    use SideClient;
-
     /**
      * Test creating a transaction
      */
diff --git a/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsConsoleClientTest.php b/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsConsoleClientTest.php
new file mode 100644
index 0000000000..553c620f20
--- /dev/null
+++ b/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsConsoleClientTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Tests\E2E\Services\Databases\TablesDB\Transactions;
+
+use Tests\E2E\Scopes\ProjectCustom;
+use Tests\E2E\Scopes\SideConsole;
+
+class TransactionsConsoleClientTest
+{
+    use TransactionsBase;
+    use ProjectCustom;
+    use SideConsole;
+}
diff --git a/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsCustomClientTest.php b/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsCustomClientTest.php
new file mode 100644
index 0000000000..3b7355faaf
--- /dev/null
+++ b/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsCustomClientTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Tests\E2E\Services\Databases\TablesDB\Transactions;
+
+use Tests\E2E\Scopes\ProjectCustom;
+use Tests\E2E\Scopes\SideClient;
+
+class TransactionsCustomClientTest
+{
+    use TransactionsBase;
+    use ProjectCustom;
+    use SideClient;
+}
diff --git a/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsCustomServerTest.php b/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsCustomServerTest.php
new file mode 100644
index 0000000000..01d4a8d057
--- /dev/null
+++ b/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsCustomServerTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Tests\E2E\Services\Databases\TablesDB\Transactions;
+
+use Tests\E2E\Scopes\ProjectCustom;
+use Tests\E2E\Scopes\SideServer;
+
+class TransactionsCustomServerTest
+{
+    use TransactionsBase;
+    use ProjectCustom;
+    use SideServer;
+}