diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 02a26297b6..61b2a47669 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -146,7 +146,6 @@ jobs:
           Avatars,
           Console,
           Databases,
-          Databases 1.6.x,
           Functions,
           FunctionsSchedule,
           GraphQL,
@@ -192,22 +191,14 @@ jobs:
 
       - name: Run ${{ matrix.service }} tests with Project table mode
         run: |
-          if [[ "${{ matrix.service }}" == "Databases 1.6.x" ]]; then
-            echo "Using Database 1.6 format"
-            export _APP_SYSTEM_RESPONSE_FORMAT=1.6.0
-            service="Databases"
-          else
-            service="${{ matrix.service }}"
-          fi
-          
+          echo "Using project tables"
           export _APP_DATABASE_SHARED_TABLES=
           export _APP_DATABASE_SHARED_TABLES_V1=
 
           docker compose exec -T \
-            -e _APP_SYSTEM_RESPONSE_FORMAT \
             -e _APP_DATABASE_SHARED_TABLES \
             -e _APP_DATABASE_SHARED_TABLES_V1 \
-            appwrite test /usr/src/code/tests/e2e/Services/$service --debug --exclude=devKeys
+            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug --exclude-group devKeys
 
   e2e_shared_mode_test:
     name: E2E Shared Mode Service Test
@@ -223,7 +214,6 @@ jobs:
             Avatars,
             Console,
             Databases,
-            Databases 1.6.x,
             Functions,
             FunctionsSchedule,
             GraphQL,
@@ -284,20 +274,10 @@ jobs:
             export _APP_DATABASE_SHARED_TABLES_V1=
           fi
           
-          if [[ "${{ matrix.service }}" == "Databases 1.6.x" ]]; then
-            echo "Using Database 1.6 format"
-            export _APP_SYSTEM_RESPONSE_FORMAT=1.6.0
-            service="Databases"
-          else
-            export _APP_SYSTEM_RESPONSE_FORMAT=
-            service="${{ matrix.service }}"
-          fi
-      
           docker compose exec -T \
-            -e _APP_SYSTEM_RESPONSE_FORMAT \
             -e _APP_DATABASE_SHARED_TABLES \
             -e _APP_DATABASE_SHARED_TABLES_V1 \
-            appwrite test /usr/src/code/tests/e2e/Services/$service --debug --exclude=devKeys
+            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug --exclude-group devKeys
 
   e2e_dev_keys:
     name: E2E Service Test (Dev Keys)