diff --git a/app/src/main/java/to/bitkit/ui/components/BalanceHeaderView.kt b/app/src/main/java/to/bitkit/ui/components/BalanceHeaderView.kt
index 3c01d24ca..e8cafe737 100644
--- a/app/src/main/java/to/bitkit/ui/components/BalanceHeaderView.kt
+++ b/app/src/main/java/to/bitkit/ui/components/BalanceHeaderView.kt
@@ -102,9 +102,11 @@ fun BalanceHeaderView(
                 modifier = modifier,
                 smallRowSymbol = btcComponents.symbol,
                 smallRowText = btcComponents.value,
+                smallRowModifier = Modifier.testTag("$testTag-secondary"),
                 largeRowPrefix = prefix,
                 largeRowText = converted.formatted,
                 largeRowSymbol = converted.symbol,
+                largeRowModifier = Modifier.testTag("$testTag-primary"),
                 showSymbol = true,
                 hideBalance = shouldHideBalance,
                 isSwipeToHideEnabled = allowSwipeToHide,
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt
index 450220fc0..0e9e086e2 100644
--- a/app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt
@@ -329,7 +329,8 @@ private fun Content(
                     showEyeIcon = true,
                     modifier = Modifier
                         .fillMaxWidth()
-                        .testTag("TotalBalance")
+                        .testTag("TotalBalance"),
+                    testTag = "TotalBalance"
                 )
                 if (!homeUiState.showEmptyState) {
                     Spacer(modifier = Modifier.height(32.dp))
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/SavingsWalletScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/SavingsWalletScreen.kt
index be83a91de..b62a1e5f1 100644
--- a/app/src/main/java/to/bitkit/ui/screens/wallets/SavingsWalletScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/wallets/SavingsWalletScreen.kt
@@ -80,7 +80,8 @@ fun SavingsWalletScreen(
                     sats = balances.totalOnchainSats.toLong(),
                     modifier = Modifier
                         .fillMaxWidth()
-                        .testTag("TotalBalance")
+                        .testTag("TotalBalance"),
+                    testTag = "TotalBalance"
                 )
                 if (!showEmptyState) {
                     Spacer(modifier = Modifier.height(32.dp))
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt
index 1a31d5c02..ec3f68ddf 100644
--- a/app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt
@@ -90,7 +90,8 @@ fun SpendingWalletScreen(
                     sats = balances.totalLightningSats.toLong(),
                     modifier = Modifier
                         .fillMaxWidth()
-                        .testTag("TotalBalance")
+                        .testTag("TotalBalance"),
+                    testTag = "TotalBalance"
                 )
                 if (!showEmptyState) {
                     Spacer(modifier = Modifier.height(32.dp))
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendConfirmScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendConfirmScreen.kt
index d5f9baf5b..bfea0d93f 100644
--- a/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendConfirmScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendConfirmScreen.kt
@@ -202,7 +202,8 @@ private fun Content(
                     onClick = { onEvent(SendEvent.BackToAmount) },
                     modifier = Modifier
                         .fillMaxWidth()
-                        .testTag("ReviewAmount")
+                        .testTag("ReviewAmount"),
+                    testTag = "ReviewAmount"
                 )
 
                 Spacer(modifier = Modifier.height(16.dp))