diff --git a/e2e/tests/room/04-discussion.spec.ts b/e2e/tests/room/04-discussion.spec.ts
index 53518b62f..b4f056b3f 100644
--- a/e2e/tests/room/04-discussion.spec.ts
+++ b/e2e/tests/room/04-discussion.spec.ts
@@ -36,9 +36,9 @@ describe('Discussion', () => {
 		await waitFor(element(by.id('new-message-view')))
 			.toBeVisible()
 			.withTimeout(2000);
-		await waitFor(element(by[textMatcher]('Discussion')))
+		await waitFor(element(by.id('new-message-view-create-discussion')))
 			.toBeVisible()
-			.withTimeout(2000);
+			.withTimeout(5000);
 		await element(by[textMatcher]('Discussion')).atIndex(0).tap();
 		await waitFor(element(by.id('create-discussion-view')))
 			.toExist()
diff --git a/e2e/tests/team/01-createteam.spec.ts b/e2e/tests/team/01-createteam.spec.ts
index b86a49efe..12588f8a2 100644
--- a/e2e/tests/team/01-createteam.spec.ts
+++ b/e2e/tests/team/01-createteam.spec.ts
@@ -82,7 +82,13 @@ describe('Create team screen', () => {
 
 		it('should delete team', async () => {
 			await element(by.id('room-info-view-edit-button')).tap();
+			await waitFor(element(by.id('room-info-edit-view-list')))
+				.toBeVisible()
+				.withTimeout(2000);
 			await element(by.id('room-info-edit-view-list')).swipe('up', 'fast', 0.5);
+			await waitFor(element(by.id('room-info-edit-view-delete')))
+				.toBeVisible()
+				.withTimeout(2000);
 			await element(by.id('room-info-edit-view-delete')).tap();
 			await waitFor(element(by[textMatcher]('Yes, delete it!')))
 				.toExist()