diff --git a/.maestro/tests/roomList/createAndDeleteDM.yaml b/.maestro/tests/roomList/createAndDeleteDM.yaml
index a6279151ea6..eed576c04fa 100644
--- a/.maestro/tests/roomList/createAndDeleteDM.yaml
+++ b/.maestro/tests/roomList/createAndDeleteDM.yaml
@@ -7,7 +7,7 @@ appId: ${MAESTRO_APP_ID}
 - tapOn:
     text: ${MAESTRO_INVITEE1_MXID}
     index: 1
-- tapOn: "Send invite"
+- tapOn: "Continue"
 - takeScreenshot: build/maestro/330-createAndDeleteDM
 - tapOn: "maestroelement2"
 - scroll
diff --git a/.maestro/tests/roomList/createAndDeleteRoom.yaml b/.maestro/tests/roomList/createAndDeleteRoom.yaml
index b53066ccd5c..54d15c820bd 100644
--- a/.maestro/tests/roomList/createAndDeleteRoom.yaml
+++ b/.maestro/tests/roomList/createAndDeleteRoom.yaml
@@ -24,8 +24,12 @@ appId: ${MAESTRO_APP_ID}
     text: ${MAESTRO_INVITEE2_MXID}
     index: 1
 - tapOn: "Invite"
+- tapOn:
+    id: "confirm_invite_unknown"
+# Close the keyboard if it's still open
+- tapOn: "Back"
+# Go back to the room details screen
 - tapOn: "Back"
-- tapOn: "aRoomName"
 - scrollUntilVisible:
     direction: DOWN
     element:
diff --git a/features/invitepeople/impl/build.gradle.kts b/features/invitepeople/impl/build.gradle.kts
index 185497c25b4..2ab2fcb4a3b 100644
--- a/features/invitepeople/impl/build.gradle.kts
+++ b/features/invitepeople/impl/build.gradle.kts
@@ -36,6 +36,7 @@ dependencies {
     implementation(projects.libraries.uiUtils)
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.usersearch.api)
+    implementation(projects.libraries.testtags)
     implementation(libs.coil.compose)
     implementation(projects.services.apperror.api)
     implementation(projects.libraries.featureflag.api)
diff --git a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitePeopleView.kt b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitePeopleView.kt
index b1f139f43cc..3e9de701659 100644
--- a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitePeopleView.kt
+++ b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitePeopleView.kt
@@ -23,6 +23,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -54,6 +55,8 @@ import io.element.android.libraries.matrix.ui.components.MatrixUserRow
 import io.element.android.libraries.matrix.ui.components.SelectedUsersRowList
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.model.getBestName
+import io.element.android.libraries.testtags.TestTags
+import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.libraries.ui.utils.strings.simplePluralStringResource
 import kotlinx.collections.immutable.ImmutableList
@@ -298,7 +301,7 @@ private fun InvitePeopleConfirmModal(
                 text = stringResource(CommonStrings.action_remove),
                 onClick = onRemove,
                 leadingIcon = IconSource.Vector(CompoundIcons.Close()),
-                modifier = Modifier.weight(1f)
+                modifier = Modifier.weight(1f).testTag(TestTags.confirmInviteUnknown),
             )
             Button(
                 text = stringResource(CommonStrings.action_invite),
diff --git a/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt
index e564ddac414..4b3a0d6ffac 100644
--- a/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt
+++ b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt
@@ -124,4 +124,6 @@ object TestTags {
      *
      */
     val roomAddressField = TestTag("room_address_field")
+
+    val confirmInviteUnknown = TestTag("confirm_invite_unknown")
 }