diff --git a/e2e/tests/room/01-createroom.spec.ts b/e2e/tests/room/01-createroom.spec.ts
index d2df8eff1..eb61aed6d 100644
--- a/e2e/tests/room/01-createroom.spec.ts
+++ b/e2e/tests/room/01-createroom.spec.ts
@@ -192,7 +192,7 @@ describe('Create room screen', () => {
 					.withTimeout(5000);
 				await element(by.id('selected-users-view-submit')).tap();
 				await waitFor(element(by.id('create-channel-view')))
-					.toExist()
+					.toBeVisible()
 					.withTimeout(5000);
 				await element(by.id('create-channel-name')).replaceText(room);
 				await element(by.id('create-channel-name')).tapReturnKey();
diff --git a/e2e/tests/room/04-discussion.spec.ts b/e2e/tests/room/04-discussion.spec.ts
index 5f06e4f63..b58302147 100644
--- a/e2e/tests/room/04-discussion.spec.ts
+++ b/e2e/tests/room/04-discussion.spec.ts
@@ -8,7 +8,8 @@ import {
 	navigateToRoom,
 	platformTypes,
 	mockMessage,
-	sleep
+	sleep,
+	checkRoomTitle
 } from '../../helpers/app';
 import { createRandomRoom, createRandomUser, ITestUser } from '../../helpers/data_setup';
 import random from '../../helpers/random';
@@ -109,15 +110,10 @@ describe('Discussion', () => {
 				.withTimeout(2000);
 			await element(by[textMatcher]('Start a Discussion')).atIndex(0).tap();
 			await waitFor(element(by.id('create-discussion-view')))
-				.toExist()
+				.toBeVisible()
 				.withTimeout(2000);
 			await element(by.id('create-discussion-submit')).tap();
-			await waitFor(element(by.id('room-view')))
-				.toExist()
-				.withTimeout(10000);
-			await waitFor(element(by.id(`room-view-title-${discussionFromActionSheet}`)))
-				.toExist()
-				.withTimeout(5000);
+			await checkRoomTitle(discussionFromActionSheet);
 		});
 	});