diff --git a/features/login/build.gradle.kts b/features/login/build.gradle.kts
index c181d3b75e..f4f8ca4844 100644
--- a/features/login/build.gradle.kts
+++ b/features/login/build.gradle.kts
@@ -42,6 +42,13 @@ dependencies {
     implementation(projects.libraries.testtags)
     implementation(projects.libraries.uiStrings)
     ksp(libs.showkase.processor)
+
     testImplementation(libs.test.junit)
+    testImplementation(libs.coroutines.test)
+    testImplementation(libs.molecule.runtime)
+    testImplementation(libs.test.truth)
+    testImplementation(libs.test.turbine)
+    testImplementation(projects.libraries.matrixtest)
+
     androidTestImplementation(libs.test.junitext)
 }
diff --git a/features/login/src/test/kotlin/io/element/android/features/login/changeserver/ChangeServerPresenterTest.kt b/features/login/src/test/kotlin/io/element/android/features/login/changeserver/ChangeServerPresenterTest.kt
new file mode 100644
index 0000000000..c8ff3de1ae
--- /dev/null
+++ b/features/login/src/test/kotlin/io/element/android/features/login/changeserver/ChangeServerPresenterTest.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package io.element.android.features.login.changeserver
+
+import app.cash.molecule.RecompositionClock
+import app.cash.molecule.moleculeFlow
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.architecture.Async
+import io.element.android.libraries.matrixtest.auth.A_HOMESERVER
+import io.element.android.libraries.matrixtest.auth.FakeAuthenticationService
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class ChangeServerPresenterTest {
+    @Test
+    fun `present - should start with default homeserver`() = runTest {
+        val presenter = ChangeServerPresenter(
+            FakeAuthenticationService(),
+        )
+        moleculeFlow(RecompositionClock.Immediate) {
+            presenter.present()
+        }.test {
+            val initialState = awaitItem()
+            assertThat(initialState.homeserver).isEqualTo(A_HOMESERVER)
+            assertThat(initialState.submitEnabled).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - disable if empty or not correct`() = runTest {
+        val presenter = ChangeServerPresenter(
+            FakeAuthenticationService(),
+        )
+        moleculeFlow(RecompositionClock.Immediate) {
+            presenter.present()
+        }.test {
+            val initialState = awaitItem()
+            initialState.eventSink.invoke(ChangeServerEvents.SetServer(""))
+            val emptyState = awaitItem()
+            assertThat(emptyState.homeserver).isEqualTo("")
+            assertThat(emptyState.submitEnabled).isFalse()
+        }
+    }
+
+    @Test
+    fun `present - submit`() = runTest {
+        val presenter = ChangeServerPresenter(
+            FakeAuthenticationService(),
+        )
+        moleculeFlow(RecompositionClock.Immediate) {
+            presenter.present()
+        }.test {
+            val initialState = awaitItem()
+            initialState.eventSink.invoke(ChangeServerEvents.Submit)
+            val loadingState = awaitItem()
+            assertThat(loadingState.submitEnabled).isFalse()
+            assertThat(loadingState.changeServerAction).isInstanceOf(Async.Loading::class.java)
+            val successState = awaitItem()
+            assertThat(successState.submitEnabled).isTrue()
+            assertThat(successState.changeServerAction).isInstanceOf(Async.Success::class.java)
+        }
+    }
+}
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Async.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Async.kt
index 94d81a28e2..d3ed18bee2 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Async.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Async.kt
@@ -39,7 +39,8 @@ sealed interface Async<out T> {
 suspend fun <T> (suspend () -> T).execute(state: MutableState<Async<T>>) {
     try {
         state.value = Async.Loading()
-        state.value = Async.Success(this())
+        val result = this()
+        state.value = Async.Success(result)
     } catch (error: Throwable) {
         state.value = Async.Failure(error)
     }
diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/auth/FakeAuthenticationService.kt b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/auth/FakeAuthenticationService.kt
new file mode 100644
index 0000000000..e637ebb722
--- /dev/null
+++ b/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/auth/FakeAuthenticationService.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.matrixtest.auth
+
+import io.element.android.libraries.matrix.MatrixClient
+import io.element.android.libraries.matrix.auth.MatrixAuthenticationService
+import io.element.android.libraries.matrix.core.SessionId
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
+
+const val A_HOMESERVER = "matrix.org"
+
+class FakeAuthenticationService : MatrixAuthenticationService {
+    override fun isLoggedIn(): Flow<Boolean> {
+        return flowOf(false)
+    }
+
+    override suspend fun getLatestSessionId(): SessionId? {
+        return null
+    }
+
+    override suspend fun restoreSession(sessionId: SessionId): MatrixClient? {
+        return null
+    }
+
+    override fun getHomeserver(): String? {
+        return null
+    }
+
+    override fun getHomeserverOrDefault(): String {
+        return A_HOMESERVER
+    }
+
+    override suspend fun setHomeserver(homeserver: String) {
+        delay(100)
+    }
+
+    override suspend fun login(username: String, password: String): SessionId {
+        return SessionId("test")
+    }
+}