diff --git a/__e2e__/tests/curate-lists.test.ts b/__e2e__/tests/curate-lists.test.ts
index bc86b633a8..104d7a4e74 100644
--- a/__e2e__/tests/curate-lists.test.ts
+++ b/__e2e__/tests/curate-lists.test.ts
@@ -4,7 +4,7 @@ import {describe, beforeAll, it} from '@jest/globals'
 import {expect} from 'detox'
 import {openApp, loginAsAlice, loginAsBob, createServer, sleep} from '../util'
 
-describe.skip('Curate lists', () => {
+describe('Curate lists', () => {
   beforeAll(async () => {
     await createServer('?users&follows&posts')
     await openApp({
@@ -165,15 +165,15 @@ describe('Curate lists 2', () => {
     await expect(element(by.id('user-bob.test'))).toBeVisible()
     await element(by.id('user-bob.test-editBtn')).tap()
     await expect(element(by.id('userAddRemoveListsModal'))).toBeVisible()
-    await element(by.id('toggleBtn-Good Ppl')).tap()
-    await element(by.id('saveBtn')).tap()
+    await element(by.id('user-bob.test-addBtn')).tap()
+    await element(by.id('doneBtn')).tap()
     await expect(element(by.id('userAddRemoveListsModal'))).not.toBeVisible()
   })
 
   it('Shows the curatelist on my profile', async () => {
     await element(by.id('bottomBarProfileBtn')).tap()
-    await element(by.id('selector')).swipe('left')
-    await element(by.id('selector-4')).tap()
+    await element(by.id('profilePager-selector')).swipe('left')
+    await element(by.id('profilePager-selector-5')).tap()
     await element(by.id('list-Good Ppl')).tap()
   })
 
@@ -186,15 +186,15 @@ describe('Curate lists 2', () => {
     await element(by.id('profileHeaderDropdownBtn')).tap()
     await element(by.text('Add to Lists')).tap()
     await expect(element(by.id('userAddRemoveListsModal'))).toBeVisible()
-    await element(by.id('toggleBtn-Good Ppl')).tap()
-    await element(by.id('saveBtn')).tap()
+    await element(by.id('user-bob.test-addBtn')).tap()
+    await element(by.id('doneBtn')).tap()
     await expect(element(by.id('userAddRemoveListsModal'))).not.toBeVisible()
 
     await element(by.id('profileHeaderDropdownBtn')).tap()
     await element(by.text('Add to Lists')).tap()
     await expect(element(by.id('userAddRemoveListsModal'))).toBeVisible()
-    await element(by.id('toggleBtn-Good Ppl')).tap()
-    await element(by.id('saveBtn')).tap()
+    await element(by.id('user-bob.test-addBtn')).tap()
+    await element(by.id('doneBtn')).tap()
     await expect(element(by.id('userAddRemoveListsModal'))).not.toBeVisible()
   })
 
@@ -205,8 +205,8 @@ describe('Curate lists 2', () => {
     await element(by.id('bottomBarSearchBtn')).tap()
     await element(by.id('searchTextInput')).typeText('alice')
     await element(by.id('searchAutoCompleteResult-alice.test')).tap()
-    await element(by.id('selector')).swipe('left')
-    await element(by.id('selector-3')).tap()
+    await element(by.id('profilePager-selector')).swipe('left')
+    await element(by.id('profilePager-selector-3')).tap()
     await element(by.id('list-Good Ppl')).tap()
     await element(by.id('headerDropdownBtn')).tap()
     await element(by.text('Report List')).tap()
diff --git a/src/state/modals/index.tsx b/src/state/modals/index.tsx
index 84fea3bad0..94d6d9ec54 100644
--- a/src/state/modals/index.tsx
+++ b/src/state/modals/index.tsx
@@ -61,6 +61,7 @@ export interface CreateOrEditListModal {
 export interface UserAddRemoveListsModal {
   name: 'user-add-remove-lists'
   subject: string
+  handle: string
   displayName: string
   onAdd?: (listUri: string) => void
   onRemove?: (listUri: string) => void
diff --git a/src/view/com/lists/ListMembers.tsx b/src/view/com/lists/ListMembers.tsx
index e6afb3d3c0..b25f3ac489 100644
--- a/src/view/com/lists/ListMembers.tsx
+++ b/src/view/com/lists/ListMembers.tsx
@@ -132,6 +132,7 @@ export function ListMembers({
         name: 'user-add-remove-lists',
         subject: profile.did,
         displayName: profile.displayName || profile.handle,
+        handle: profile.handle,
       })
     },
     [openModal],
diff --git a/src/view/com/modals/UserAddRemoveLists.tsx b/src/view/com/modals/UserAddRemoveLists.tsx
index 8c3dc8bb7d..506ce15d08 100644
--- a/src/view/com/modals/UserAddRemoveLists.tsx
+++ b/src/view/com/modals/UserAddRemoveLists.tsx
@@ -28,11 +28,13 @@ export const snapPoints = ['fullscreen']
 
 export function Component({
   subject,
+  handle,
   displayName,
   onAdd,
   onRemove,
 }: {
   subject: string
+  handle: string
   displayName: string
   onAdd?: (listUri: string) => void
   onRemove?: (listUri: string) => void
@@ -60,6 +62,7 @@ export function Component({
             list={list}
             memberships={memberships}
             subject={subject}
+            handle={handle}
             onAdd={onAdd}
             onRemove={onRemove}
           />
@@ -87,6 +90,7 @@ function ListItem({
   list,
   memberships,
   subject,
+  handle,
   onAdd,
   onRemove,
 }: {
@@ -94,6 +98,7 @@ function ListItem({
   list: GraphDefs.ListView
   memberships: ListMembersip[] | undefined
   subject: string
+  handle: string
   onAdd?: (listUri: string) => void
   onRemove?: (listUri: string) => void
 }) {
@@ -182,7 +187,7 @@ function ListItem({
           <ActivityIndicator />
         ) : (
           <Button
-            testID={`user-${subject}-addBtn`}
+            testID={`user-${handle}-addBtn`}
             type="default"
             label={membership === false ? _(msg`Add`) : _(msg`Remove`)}
             onPress={onToggleMembership}
diff --git a/src/view/com/profile/ProfileHeader.tsx b/src/view/com/profile/ProfileHeader.tsx
index 39e3e42eca..e006cac7d9 100644
--- a/src/view/com/profile/ProfileHeader.tsx
+++ b/src/view/com/profile/ProfileHeader.tsx
@@ -217,6 +217,7 @@ let ProfileHeaderLoaded = ({
     openModal({
       name: 'user-add-remove-lists',
       subject: profile.did,
+      handle: profile.handle,
       displayName: profile.displayName || profile.handle,
       onAdd: invalidateProfileQuery,
       onRemove: invalidateProfileQuery,
diff --git a/src/view/shell/desktop/Search.tsx b/src/view/shell/desktop/Search.tsx
index f899431b69..6201f828ff 100644
--- a/src/view/shell/desktop/Search.tsx
+++ b/src/view/shell/desktop/Search.tsx
@@ -42,6 +42,7 @@ export function SearchResultCard({
 
   return (
     <Link
+      testID={`searchAutoCompleteResult-${profile.handle}`}
       href={makeProfileLink(profile)}
       title={profile.handle}
       asAnchor