diff --git a/.github/workflows/integration-mariadb.yml b/.github/workflows/integration-mariadb.yml
index 85355e380a6..2f9cb696f21 100644
--- a/.github/workflows/integration-mariadb.yml
+++ b/.github/workflows/integration-mariadb.yml
@@ -52,7 +52,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
+        test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.2']
         server-versions: ['stable30']
         guests-versions: ['stable30']
diff --git a/.github/workflows/integration-mysql.yml b/.github/workflows/integration-mysql.yml
index 06f4d63a972..38bf5f6721e 100644
--- a/.github/workflows/integration-mysql.yml
+++ b/.github/workflows/integration-mysql.yml
@@ -52,7 +52,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
+        test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.2']
         server-versions: ['stable30']
         guests-versions: ['stable30']
diff --git a/.github/workflows/integration-oci.yml b/.github/workflows/integration-oci.yml
index bf037768013..08c0a36bba4 100644
--- a/.github/workflows/integration-oci.yml
+++ b/.github/workflows/integration-oci.yml
@@ -52,7 +52,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
+        test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.2']
         server-versions: ['stable30']
         guests-versions: ['stable30']
diff --git a/.github/workflows/integration-pgsql.yml b/.github/workflows/integration-pgsql.yml
index 8e658b58d3f..ea2b1402c09 100644
--- a/.github/workflows/integration-pgsql.yml
+++ b/.github/workflows/integration-pgsql.yml
@@ -49,7 +49,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
+        test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.3']
         server-versions: ['stable30']
         guests-versions: ['stable30']
diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml
index f0ed8b15922..c00423fb555 100644
--- a/.github/workflows/integration-sqlite.yml
+++ b/.github/workflows/integration-sqlite.yml
@@ -52,7 +52,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
+        test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.2']
         server-versions: ['stable30']
         guests-versions: ['stable30']
diff --git a/tests/integration/features/chat-1/bots.feature b/tests/integration/features/chat-2/bots.feature
similarity index 100%
rename from tests/integration/features/chat-1/bots.feature
rename to tests/integration/features/chat-2/bots.feature
diff --git a/tests/integration/features/chat-1/mentions.feature b/tests/integration/features/chat-2/mentions.feature
similarity index 100%
rename from tests/integration/features/chat-1/mentions.feature
rename to tests/integration/features/chat-2/mentions.feature
diff --git a/tests/integration/features/chat-2/poll.feature b/tests/integration/features/chat-3/poll.feature
similarity index 100%
rename from tests/integration/features/chat-2/poll.feature
rename to tests/integration/features/chat-3/poll.feature
diff --git a/tests/integration/features/chat-2/public-read-only.feature b/tests/integration/features/chat-3/public-read-only.feature
similarity index 100%
rename from tests/integration/features/chat-2/public-read-only.feature
rename to tests/integration/features/chat-3/public-read-only.feature
diff --git a/tests/integration/features/chat-2/public.feature b/tests/integration/features/chat-3/public.feature
similarity index 100%
rename from tests/integration/features/chat-2/public.feature
rename to tests/integration/features/chat-3/public.feature
diff --git a/tests/integration/features/chat-2/reaction.feature b/tests/integration/features/chat-3/reaction.feature
similarity index 100%
rename from tests/integration/features/chat-2/reaction.feature
rename to tests/integration/features/chat-3/reaction.feature
diff --git a/tests/integration/features/chat-2/read-status.feature b/tests/integration/features/chat-3/read-status.feature
similarity index 100%
rename from tests/integration/features/chat-2/read-status.feature
rename to tests/integration/features/chat-3/read-status.feature
diff --git a/tests/integration/features/chat-2/reference-id.feature b/tests/integration/features/chat-3/reference-id.feature
similarity index 100%
rename from tests/integration/features/chat-2/reference-id.feature
rename to tests/integration/features/chat-3/reference-id.feature
diff --git a/tests/integration/features/chat-2/reminder.feature b/tests/integration/features/chat-3/reminder.feature
similarity index 100%
rename from tests/integration/features/chat-2/reminder.feature
rename to tests/integration/features/chat-3/reminder.feature
diff --git a/tests/integration/features/chat-2/reply.feature b/tests/integration/features/chat-4/reply.feature
similarity index 100%
rename from tests/integration/features/chat-2/reply.feature
rename to tests/integration/features/chat-4/reply.feature
diff --git a/tests/integration/features/chat-2/rich-messages.feature b/tests/integration/features/chat-4/rich-messages.feature
similarity index 100%
rename from tests/integration/features/chat-2/rich-messages.feature
rename to tests/integration/features/chat-4/rich-messages.feature
diff --git a/tests/integration/features/chat-2/rich-object-share.feature b/tests/integration/features/chat-4/rich-object-share.feature
similarity index 100%
rename from tests/integration/features/chat-2/rich-object-share.feature
rename to tests/integration/features/chat-4/rich-object-share.feature
diff --git a/tests/integration/features/chat-2/search.feature b/tests/integration/features/chat-4/search.feature
similarity index 100%
rename from tests/integration/features/chat-2/search.feature
rename to tests/integration/features/chat-4/search.feature
diff --git a/tests/integration/features/chat-2/system-messages.feature b/tests/integration/features/chat-4/system-messages.feature
similarity index 100%
rename from tests/integration/features/chat-2/system-messages.feature
rename to tests/integration/features/chat-4/system-messages.feature
diff --git a/tests/integration/features/chat-2/typing-privacy.feature b/tests/integration/features/chat-4/typing-privacy.feature
similarity index 100%
rename from tests/integration/features/chat-2/typing-privacy.feature
rename to tests/integration/features/chat-4/typing-privacy.feature
diff --git a/tests/integration/features/chat-2/unread-messages.feature b/tests/integration/features/chat-4/unread-messages.feature
similarity index 100%
rename from tests/integration/features/chat-2/unread-messages.feature
rename to tests/integration/features/chat-4/unread-messages.feature
diff --git a/tests/integration/features/conversation-1/bruteforce-protection.feature b/tests/integration/features/conversation-5/bruteforce-protection.feature
similarity index 100%
rename from tests/integration/features/conversation-1/bruteforce-protection.feature
rename to tests/integration/features/conversation-5/bruteforce-protection.feature
diff --git a/tests/integration/features/conversation-1/delete-room.feature b/tests/integration/features/conversation-5/delete-room.feature
similarity index 100%
rename from tests/integration/features/conversation-1/delete-room.feature
rename to tests/integration/features/conversation-5/delete-room.feature
diff --git a/tests/integration/features/conversation-1/delete-user.feature b/tests/integration/features/conversation-5/delete-user.feature
similarity index 100%
rename from tests/integration/features/conversation-1/delete-user.feature
rename to tests/integration/features/conversation-5/delete-user.feature