diff --git a/e2e/tests/onboarding/04-createuser.spec.ts b/e2e/tests/onboarding/04-createuser.spec.ts
index 1852ba758..88c5a58c9 100644
--- a/e2e/tests/onboarding/04-createuser.spec.ts
+++ b/e2e/tests/onboarding/04-createuser.spec.ts
@@ -16,7 +16,7 @@ describe('Create user screen', () => {
 			await element(by.id('register-view-email')).replaceText(data.registeringUser.email);
 			await element(by.id('register-view-email')).tapReturnKey();
 			await element(by.id('register-view-password')).replaceText(data.registeringUser.password);
-			await element(by.id('login-view-password')).tapReturnKey();
+			await element(by.id('register-view-password')).tapReturnKey();
 			await waitFor(element(by.id('rooms-list-view')))
 				.toBeVisible()
 				.withTimeout(60000);
diff --git a/e2e/tests/room/02-room.spec.ts b/e2e/tests/room/02-room.spec.ts
index 98f0bb1df..dc68d7a9b 100644
--- a/e2e/tests/room/02-room.spec.ts
+++ b/e2e/tests/room/02-room.spec.ts
@@ -366,7 +366,7 @@ describe('Room screen', () => {
 				await waitFor(element(by.id('emoji-searchbar-input')))
 					.toExist()
 					.withTimeout(2000);
-				await element(by.id('emoji-searchbar-input')).typeText('laughing');
+				await element(by.id('emoji-searchbar-input')).replaceText('laughing');
 				await waitFor(element(by.id('emoji-laughing')))
 					.toExist()
 					.withTimeout(4000);
diff --git a/e2e/tests/team/03-moveconvert.spec.ts b/e2e/tests/team/03-moveconvert.spec.ts
index 704b59a44..09e756f48 100644
--- a/e2e/tests/team/03-moveconvert.spec.ts
+++ b/e2e/tests/team/03-moveconvert.spec.ts
@@ -167,6 +167,7 @@ describe('Move/Convert Team', () => {
 			await waitFor(element(by.id(`select-list-view-item-${toBeMoved}`)))
 				.toExist()
 				.withTimeout(2000);
+			await sleep(300); // wait for animation
 			await element(by.id(`select-list-view-item-${toBeMoved}`)).tap();
 			await waitFor(element(by.id('select-list-view-submit')))
 				.toExist()