diff --git a/.maestro/allTests.yaml b/.maestro/allTests.yaml
index 8283e9fed5..cd3ca342e2 100644
--- a/.maestro/allTests.yaml
+++ b/.maestro/allTests.yaml
@@ -1,5 +1,7 @@
 appId: ${APP_ID}
 ---
+## Check that all env variables required in the whole test suite are declared (to fail faster)
+- runScript: ./scripts/checkEnv.js
 - runFlow: tests/init.yaml
 - runFlow: tests/account/login.yaml
 - runFlow: tests/settings/settings.yaml
diff --git a/.maestro/scripts/checkEnv.js b/.maestro/scripts/checkEnv.js
new file mode 100644
index 0000000000..74b4b56956
--- /dev/null
+++ b/.maestro/scripts/checkEnv.js
@@ -0,0 +1,9 @@
+// This array contains all the required environment variable. When adding a variable, add it here also.
+// If a variable is missing, an error will occur.
+
+if (APP_ID == null) throw "Fatal: missing env variable APP_ID"
+if (USERNAME == null) throw "Fatal: missing env variable USERNAME"
+if (PASSWORD == null) throw "Fatal: missing env variable PASSWORD"
+if (ROOM_NAME == null) throw "Fatal: missing env variable ROOM_NAME"
+if (INVITEE1_MXID == null) throw "Fatal: missing env variable INVITEE1_MXID"
+if (INVITEE2_MXID == null) throw "Fatal: missing env variable INVITEE2_MXID"
diff --git a/.maestro/tests/account/changeServer.yaml b/.maestro/tests/account/changeServer.yaml
index df4b12f253..e503589f5c 100644
--- a/.maestro/tests/account/changeServer.yaml
+++ b/.maestro/tests/account/changeServer.yaml
@@ -9,9 +9,13 @@ appId: ${APP_ID}
 - tapOn: "Other"
 - tapOn:
     id: "change_server-server"
-- inputText: "element"
+# Test server that does not support sliding sync.
+- inputText: "gnuradio"
 - hideKeyboard
-- tapOn: "element.io"
+- tapOn: "gnuradio.org"
+- extendedWaitUntil:
+    visible: "This server currently doesn’t support sliding sync."
+    timeout: 10_000
 - tapOn: "Cancel"
 - back
 - back
diff --git a/.maestro/tests/roomList/createAndDeleteRoom.yaml b/.maestro/tests/roomList/createAndDeleteRoom.yaml
index b2b7c1da0b..5ec7060679 100644
--- a/.maestro/tests/roomList/createAndDeleteRoom.yaml
+++ b/.maestro/tests/roomList/createAndDeleteRoom.yaml
@@ -17,7 +17,7 @@ appId: ${APP_ID}
 - takeScreenshot: build/maestro/320-createAndDeleteRoom
 - tapOn: "aRoomName"
 - tapOn: "Invite people"
-# assert there's 1 memeber and 1 invitee
+# assert there's 1 member and 1 invitee
 - tapOn: "Search for someone"
 - inputText: ${INVITEE2_MXID}
 - tapOn:
@@ -27,7 +27,7 @@ appId: ${APP_ID}
 - tapOn: "Back"
 - tapOn: "aRoomName"
 - tapOn: "People"
-# assert there's 1 memeber and 2 invitees
+# assert there's 1 member and 2 invitees
 - tapOn: "Back"
 - tapOn: "Leave room"
 - tapOn: "Leave"
diff --git a/.maestro/tests/roomList/searchRoomList.yaml b/.maestro/tests/roomList/searchRoomList.yaml
index 5125109197..6c31acd4db 100644
--- a/.maestro/tests/roomList/searchRoomList.yaml
+++ b/.maestro/tests/roomList/searchRoomList.yaml
@@ -7,6 +7,7 @@ appId: ${APP_ID}
 - tapOn: ${ROOM_NAME}
 # Back from timeline
 - back
+- assertVisible: "MyR"
 # Close keyboard
 - hideKeyboard
 # Back from search