diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index c44f3a3..11ade49 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -24,7 +24,7 @@
         {gettext("Open in email program")}
       </.button>
       <%= if can?(@current_user, :create, Mv.Membership.Member) do %>
-        <.button variant="primary" navigate={~p"/members/new"}>
+        <.button variant="primary" navigate={~p"/members/new"} data-testid="member-new">
           <.icon name="hero-plus" /> {gettext("New Member")}
         </.button>
       <% end %>
@@ -86,6 +86,7 @@
   <.table
     id="members"
     rows={@members}
+    row_id={fn member -> "row-#{member.id}" end}
     row_click={fn member -> JS.navigate(~p"/members/#{member}") end}
     dynamic_cols={@dynamic_cols}
     sort_field={@sort_field}
@@ -300,7 +301,9 @@
       </div>
 
       <%= if can?(@current_user, :update, member) do %>
-        <.link navigate={~p"/members/#{member}/edit"}>{gettext("Edit")}</.link>
+        <.link navigate={~p"/members/#{member}/edit"} data-testid="member-edit">
+          {gettext("Edit")}
+        </.link>
       <% end %>
     </:action>
 
@@ -309,6 +312,7 @@
         <.link
           phx-click={JS.push("delete", value: %{id: member.id}) |> hide("#row-#{member.id}")}
           data-confirm={gettext("Are you sure?")}
+          data-testid="member-delete"
         >
           {gettext("Delete")}
         </.link>
diff --git a/lib/mv_web/live/member_live/show.ex b/lib/mv_web/live/member_live/show.ex
index 9ac1fc8..604f166 100644
--- a/lib/mv_web/live/member_live/show.ex
+++ b/lib/mv_web/live/member_live/show.ex
@@ -40,7 +40,11 @@ defmodule MvWeb.MemberLive.Show do
         </h1>
 
         <%= if can?(@current_user, :update, @member) do %>
-          <.button variant="primary" navigate={~p"/members/#{@member}/edit?return_to=show"}>
+          <.button
+            variant="primary"
+            navigate={~p"/members/#{@member}/edit?return_to=show"}
+            data-testid="member-edit"
+          >
             {gettext("Edit Member")}
           </.button>
         <% end %>