diff --git a/RiotSwiftUI/Modules/Authentication/ServerSelection/MockAuthenticationServerSelectionScreenState.swift b/RiotSwiftUI/Modules/Authentication/ServerSelection/MockAuthenticationServerSelectionScreenState.swift
index 02cfc1ba58..ac95c3d696 100644
--- a/RiotSwiftUI/Modules/Authentication/ServerSelection/MockAuthenticationServerSelectionScreenState.swift
+++ b/RiotSwiftUI/Modules/Authentication/ServerSelection/MockAuthenticationServerSelectionScreenState.swift
@@ -38,7 +38,7 @@ enum MockAuthenticationServerSelectionScreenState: MockScreenState, CaseIterable
         let viewModel: AuthenticationServerSelectionViewModel
         switch self {
         case .matrix:
-            viewModel = AuthenticationServerSelectionViewModel(homeserverAddress: "https://matrix.org",
+            viewModel = AuthenticationServerSelectionViewModel(homeserverAddress: "matrix.org",
                                                                hasModalPresentation: true)
         case .emptyAddress:
             viewModel = AuthenticationServerSelectionViewModel(homeserverAddress: "",
@@ -48,7 +48,7 @@ enum MockAuthenticationServerSelectionScreenState: MockScreenState, CaseIterable
                                                                hasModalPresentation: true)
             Task { await viewModel.displayError(.footerMessage(VectorL10n.errorCommonMessage)) }
         case .nonModal:
-            viewModel = AuthenticationServerSelectionViewModel(homeserverAddress: "https://matrix.org",
+            viewModel = AuthenticationServerSelectionViewModel(homeserverAddress: "matrix.org",
                                                                hasModalPresentation: false)
         }
         
diff --git a/RiotSwiftUI/Modules/Authentication/ServerSelection/Test/UI/AuthenticationServerSelectionUITests.swift b/RiotSwiftUI/Modules/Authentication/ServerSelection/Test/UI/AuthenticationServerSelectionUITests.swift
index 84a39a4f4e..4908493f24 100644
--- a/RiotSwiftUI/Modules/Authentication/ServerSelection/Test/UI/AuthenticationServerSelectionUITests.swift
+++ b/RiotSwiftUI/Modules/Authentication/ServerSelection/Test/UI/AuthenticationServerSelectionUITests.swift
@@ -43,7 +43,7 @@ class AuthenticationServerSelectionUITests: MockScreenTest {
     
     func verifyNormalState() {
         let serverTextField = app.textFields.element
-        XCTAssertEqual(serverTextField.value as? String, "matrix.org", "The server shown should be matrix.org with the https scheme hidden.")
+        XCTAssertEqual(serverTextField.value as? String, "matrix.org", "The server shown should be matrix.org as passed to the view model init.")
         
         let confirmButton = app.buttons["confirmButton"]
         XCTAssertEqual(confirmButton.label, VectorL10n.confirm, "The confirm button should say Confirm when in modal presentation.")
diff --git a/RiotSwiftUI/Modules/Settings/ChangePassword/Test/UI/ChangePasswordUITests.swift b/RiotSwiftUI/Modules/Settings/ChangePassword/Test/UI/ChangePasswordUITests.swift
index 5bdc3fddc2..d534eac16c 100644
--- a/RiotSwiftUI/Modules/Settings/ChangePassword/Test/UI/ChangePasswordUITests.swift
+++ b/RiotSwiftUI/Modules/Settings/ChangePassword/Test/UI/ChangePasswordUITests.swift
@@ -47,15 +47,15 @@ class ChangePasswordUITests: MockScreenTest {
         
         let oldPasswordTextField = app.secureTextFields["oldPasswordTextField"]
         XCTAssertTrue(oldPasswordTextField.exists, "The text field should be shown.")
-        XCTAssertEqual(oldPasswordTextField.label, "old password", "The text field should be showing the placeholder before text is input.")
+        XCTAssertEqual(oldPasswordTextField.label, "Old password", "The text field should be showing the placeholder before text is input.")
 
         let newPasswordTextField1 = app.secureTextFields["newPasswordTextField1"]
         XCTAssertTrue(newPasswordTextField1.exists, "The text field should be shown.")
-        XCTAssertEqual(newPasswordTextField1.label, "new password", "The text field should be showing the placeholder before text is input.")
+        XCTAssertEqual(newPasswordTextField1.label, "New password", "The text field should be showing the placeholder before text is input.")
 
         let newPasswordTextField2 = app.secureTextFields["newPasswordTextField2"]
         XCTAssertTrue(newPasswordTextField2.exists, "The text field should be shown.")
-        XCTAssertEqual(newPasswordTextField2.label, "confirm password", "The text field should be showing the placeholder before text is input.")
+        XCTAssertEqual(newPasswordTextField2.label, "Confirm password", "The text field should be showing the placeholder before text is input.")
         
         let submitButton = app.buttons["submitButton"]
         XCTAssertTrue(submitButton.exists, "The submit button should be shown.")
@@ -80,7 +80,7 @@ class ChangePasswordUITests: MockScreenTest {
 
         let newPasswordTextField2 = app.secureTextFields["newPasswordTextField2"]
         XCTAssertTrue(newPasswordTextField2.exists, "The text field should be shown.")
-        XCTAssertEqual(newPasswordTextField2.label, "confirm password", "The text field should be showing the placeholder before text is input.")
+        XCTAssertEqual(newPasswordTextField2.label, "Confirm password", "The text field should be showing the placeholder before text is input.")
 
         let submitButton = app.buttons["submitButton"]
         XCTAssertTrue(submitButton.exists, "The submit button should be shown.")
diff --git a/changelog.d/6386.bugfix b/changelog.d/6386.bugfix
new file mode 100644
index 0000000000..3135984e4d
--- /dev/null
+++ b/changelog.d/6386.bugfix
@@ -0,0 +1 @@
+Fix a few failing UI tests.