diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3644b1d1c0..19a77c8a56 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -179,11 +179,27 @@ jobs:
             export _APP_DATABASE_SHARED_TABLES=
             export _APP_DATABASE_SHARED_TABLES_V1=
           fi
-      
-          docker compose exec -T \
-            -e _APP_DATABASE_SHARED_TABLES \
-            -e _APP_DATABASE_SHARED_TABLES_V1 \
-            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }}/${{ matrix.service }}${{ matrix.test_suffix }}Test.php --debug
+
+          TEST_SUFFIXES=${{ matrix.test_suffix }}
+          TEST_FOLDER="/usr/src/code/tests/e2e/Services/${{ matrix.service }}"
+          ALL_TEST_FILES=$(find "$TEST_FOLDER" -type f -name "*Test.php")
+
+          for TEST_FILE in $ALL_TEST_FILES; do
+            SUFFIX=$(echo "$TEST_FILE" | grep -oE '(CustomClient|CustomServer|ConsoleClient)Test\.php$' | sed 's/Test\.php$//')
+
+            if [ -n "$SUFFIX" ]; then
+              if [[ "$TEST_SUFFIXES" == *"$SUFFIX"* ]]; then
+                docker compose exec -T \
+                  -e _APP_DATABASE_SHARED_TABLES \
+                  -e _APP_DATABASE_SHARED_TABLES_V1 \
+                  appwrite test "$TEST_FILE" --debug
+            else
+              docker compose exec -T \
+                -e _APP_DATABASE_SHARED_TABLES \
+                -e _APP_DATABASE_SHARED_TABLES_V1 \
+                appwrite test "$TEST_FILE" --debug
+            fi
+          done
 
   benchmarking:
     name: Benchmark