diff --git a/lib/mv_web/live/user_live/index.html.heex b/lib/mv_web/live/user_live/index.html.heex
index dcb2e83..cb945e2 100644
--- a/lib/mv_web/live/user_live/index.html.heex
+++ b/lib/mv_web/live/user_live/index.html.heex
@@ -3,14 +3,19 @@
     {gettext("Listing Users")}
     <:actions>
       <%= if can?(@current_user, :create, Mv.Accounts.User) do %>
-        <.button variant="primary" navigate={~p"/users/new"}>
+        <.button variant="primary" navigate={~p"/users/new"} data-testid="user-new">
           <.icon name="hero-plus" /> {gettext("New User")}
         </.button>
       <% end %>
     </:actions>
   </.header>
 
-  <.table id="users" rows={@users} row_click={fn user -> JS.navigate(~p"/users/#{user}") end}>
+  <.table
+    id="users"
+    rows={@users}
+    row_id={fn user -> "row-#{user.id}" end}
+    row_click={fn user -> JS.navigate(~p"/users/#{user}") end}
+  >
     <:col
       :let={user}
       label={
@@ -65,7 +70,9 @@
       </div>
 
       <%= if can?(@current_user, :update, user) do %>
-        <.link navigate={~p"/users/#{user}/edit"}>{gettext("Edit")}</.link>
+        <.link navigate={~p"/users/#{user}/edit"} data-testid="user-edit">
+          {gettext("Edit")}
+        </.link>
       <% end %>
     </:action>
 
@@ -74,6 +81,7 @@
         <.link
           phx-click={JS.push("delete", value: %{id: user.id}) |> hide("#row-#{user.id}")}
           data-confirm={gettext("Are you sure?")}
+          data-testid="user-delete"
         >
           {gettext("Delete")}
         </.link>
diff --git a/lib/mv_web/live/user_live/show.ex b/lib/mv_web/live/user_live/show.ex
index fa4f186..5114b74 100644
--- a/lib/mv_web/live/user_live/show.ex
+++ b/lib/mv_web/live/user_live/show.ex
@@ -42,7 +42,11 @@ defmodule MvWeb.UserLive.Show do
             <span class="sr-only">{gettext("Back to users list")}</span>
           </.button>
           <%= if can?(@current_user, :update, @user) do %>
-            <.button variant="primary" navigate={~p"/users/#{@user}/edit?return_to=show"}>
+            <.button
+              variant="primary"
+              navigate={~p"/users/#{@user}/edit?return_to=show"}
+              data-testid="user-edit"
+            >
               <.icon name="hero-pencil-square" /> {gettext("Edit User")}
             </.button>
           <% end %>