diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 6e8404890..be8f9b14d 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -305,6 +305,7 @@ jobs:
       matrix:
         shard:
           - { name: multi_address_2_regtest, grep: "@multi_address_2" }
+          - { name: pubky_paykit, grep: "@pubky" }
 
     name: e2e-tests-staging - ${{ matrix.shard.name }}
 
diff --git a/app/src/main/java/to/bitkit/ui/screens/contacts/ContactActivityScreen.kt b/app/src/main/java/to/bitkit/ui/screens/contacts/ContactActivityScreen.kt
index 1e51dfba3..1e462752e 100644
--- a/app/src/main/java/to/bitkit/ui/screens/contacts/ContactActivityScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/contacts/ContactActivityScreen.kt
@@ -127,6 +127,7 @@ private fun ContactActivityList(
         onActivityItemClick = onActivityItemClick,
         onEmptyActivityRowClick = {},
         contentPadding = PaddingValues(top = 0.dp),
+        activityTestTagPrefix = "ContactActivity",
         titleProvider = { activity ->
             name?.let {
                 val titleRes = if (activity.isSent()) {
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityListGrouped.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityListGrouped.kt
index 10ee33dfd..6088073a7 100644
--- a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityListGrouped.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityListGrouped.kt
@@ -48,6 +48,7 @@ fun ActivityListGrouped(
     showFooter: Boolean = false,
     onAllActivityButtonClick: () -> Unit = {},
     contentPadding: PaddingValues = PaddingValues(top = 20.dp),
+    activityTestTagPrefix: String = "Activity",
     titleProvider: @Composable (Activity) -> String? = { null },
 ) {
     val contacts by activityListViewModel?.contacts?.collectAsStateWithLifecycle() ?: remember {
@@ -108,7 +109,7 @@ fun ActivityListGrouped(
                                 ActivityRow(
                                     item = item,
                                     onClick = onActivityItemClick,
-                                    testTag = "Activity-$index",
+                                    testTag = "$activityTestTagPrefix-$index",
                                     title = titleProvider(item) ?: contactActivityTitle(item, contacts),
                                 )
                                 VerticalSpacer(16.dp)