diff --git a/app/src/androidTest/kotlin/com/tangem/tests/BuyTokenTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/BuyTokenTest.kt
index d65c64ed2b..1c05fa58dc 100644
--- a/app/src/androidTest/kotlin/com/tangem/tests/BuyTokenTest.kt
+++ b/app/src/androidTest/kotlin/com/tangem/tests/BuyTokenTest.kt
@@ -348,10 +348,18 @@ class BuyTokenTest : BaseTestCase() {
                 onBuyTokenDetailsScreen { providerTitle.performClick() }
             }
             step("Assert available provider name is displayed") {
-                onSelectProviderBottomSheet { availableProviderItem.assertIsDisplayed() }
+                onSelectProviderBottomSheet {
+                    flakySafely(timeoutMs = 20_000) {
+                        availableProviderItem.assertIsDisplayed()
+                    }
+                }
             }
             step("Assert unavailable provider name is displayed") {
-                onSelectProviderBottomSheet { unavailableProviderItem.assertIsDisplayed() }
+                onSelectProviderBottomSheet {
+                    flakySafely(timeoutMs = 20_000) {
+                        unavailableProviderItem.assertIsDisplayed()
+                    }
+                }
             }
             step("Click on 'Expand payment methods' button") {
                 onSelectProviderBottomSheet { paymentMethodExpandButton.clickWithAssertion() }
@@ -393,7 +401,7 @@ class BuyTokenTest : BaseTestCase() {
         }
     }
 
-    @AllureId("2570")
+    @AllureId("3479")
     @DisplayName("Onramp: validate 'Select payment method' bottom sheet")
     @Test
     fun validatePaymentMethodScreenTest() {
diff --git a/app/src/androidTest/kotlin/com/tangem/tests/OrganizeTokensTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/OrganizeTokensTest.kt
index e64113e05e..6d89ee640d 100644
--- a/app/src/androidTest/kotlin/com/tangem/tests/OrganizeTokensTest.kt
+++ b/app/src/androidTest/kotlin/com/tangem/tests/OrganizeTokensTest.kt
@@ -79,12 +79,16 @@ class OrganizeTokensTest : BaseTestCase() {
         setupHooks().run {
             val ethereumTitle = "Ethereum"
             val bitcoinTitle = "Bitcoin"
+            val balance = "$184.85"
             step("Open 'Main Screen'") {
                 scenario(OpenMainScreenScenario(composeTestRule))
             }
             step("Click on 'Synchronize addresses' button" ) {
                 onMainScreen { synchronizeAddressesButton.clickWithAssertion() }
             }
+            step("Assert wallet balance = '$balance'") {
+                onMainScreen { walletBalance().assertTextContains(balance) }
+            }
             step("Check positions of tokens on 'Main Screen'") {
                 onMainScreen {
                     tokenWithTitleAndPosition(bitcoinTitle, 0).assertIsDisplayed()
@@ -154,12 +158,16 @@ class OrganizeTokensTest : BaseTestCase() {
             val ethereumTitle = "Ethereum"
             val bitcoinTitle = "Bitcoin"
             val polygonTitle = "Polygon"
+            val balance = "$184.85"
             step("Open 'Main Screen'") {
                 scenario(OpenMainScreenScenario(composeTestRule))
             }
             step("Click on 'Synchronize addresses' button" ) {
                 onMainScreen { synchronizeAddressesButton.clickWithAssertion() }
             }
+            step("Assert wallet balance = '$balance'") {
+                onMainScreen { walletBalance().assertTextContains(balance) }
+            }
             step("Check positions of tokens on 'Main Screen'") {
                 onMainScreen {
                     tokenWithTitleAndPosition(bitcoinTitle, 0).assertIsDisplayed()