diff --git a/app/src/main/java/to/bitkit/ui/settings/advanced/ElectrumConfigScreen.kt b/app/src/main/java/to/bitkit/ui/settings/advanced/ElectrumConfigScreen.kt
index d37a6ea8e..00322eb29 100644
--- a/app/src/main/java/to/bitkit/ui/settings/advanced/ElectrumConfigScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/advanced/ElectrumConfigScreen.kt
@@ -80,12 +80,14 @@ fun ElectrumConfigScreen(
                     description = context.getString(R.string.settings__es__server_updated_message)
                         .replace("{host}", uiState.host)
                         .replace("{port}", uiState.port),
+                    testTag = "ElectrumUpdatedToast",
                 )
             } else {
                 app.toast(
                     type = Toast.ToastType.WARNING,
                     title = context.getString(R.string.settings__es__server_error),
                     description = context.getString(R.string.settings__es__server_error_description),
+                    testTag = "ElectrumErrorToast",
                 )
             }
             viewModel.clearConnectionResult()
diff --git a/app/src/main/java/to/bitkit/ui/settings/advanced/RgsServerScreen.kt b/app/src/main/java/to/bitkit/ui/settings/advanced/RgsServerScreen.kt
index b53bab3ac..36d0b52c6 100644
--- a/app/src/main/java/to/bitkit/ui/settings/advanced/RgsServerScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/advanced/RgsServerScreen.kt
@@ -71,12 +71,14 @@ fun RgsServerScreen(
                     type = Toast.ToastType.SUCCESS,
                     title = context.getString(R.string.settings__rgs__update_success_title),
                     description = context.getString(R.string.settings__rgs__update_success_description),
+                    testTag = "RgsUpdatedToast",
                 )
             } else {
                 app.toast(
                     type = Toast.ToastType.ERROR,
                     title = context.getString(R.string.wallet__ldk_start_error_title),
                     description = result.exceptionOrNull()?.message ?: "Unknown error",
+                    testTag = "RgsErrorToast",
                 )
             }
             viewModel.clearConnectionResult()