diff --git a/test/mv_web/member_live/index_test.exs b/test/mv_web/member_live/index_test.exs
index ce47a43..75d7efb 100644
--- a/test/mv_web/member_live/index_test.exs
+++ b/test/mv_web/member_live/index_test.exs
@@ -35,8 +35,7 @@ defmodule MvWeb.MemberLive.IndexTest do
   test "shows translated flash message after creating a member in German", %{conn: conn} do
     conn = conn_with_oidc_user(conn)
     conn = Plug.Test.init_test_session(conn, locale: "de")
-    {:ok, view, _html} = live(conn, "/members")
-    view |> element("a", "Neues Mitglied") |> render_click()
+    {:ok, form_view, _html} = live(conn, "/members/new")
 
     form_data = %{
       "member[first_name]" => "Max",
@@ -44,15 +43,20 @@ defmodule MvWeb.MemberLive.IndexTest do
       "member[email]" => "max@example.com"
     }
 
-    view |> form("#member-form", form_data) |> render_submit()
-    assert has_element?(view, "#flash-group", "Mitglied erstellt erfolgreich")
+    # Submit form and follow the redirect to get the flash message
+    {:ok, index_view, _html} = 
+      form_view
+      |> form("#member-form", form_data)
+      |> render_submit()
+      |> follow_redirect(conn, "/members")
+    
+    assert has_element?(index_view, "#flash-group", "Mitglied erstellt erfolgreich")
   end
 
   test "shows translated flash message after creating a member in English", %{conn: conn} do
     conn = conn_with_oidc_user(conn)
     conn = Plug.Test.init_test_session(conn, locale: "en")
-    {:ok, view, _html} = live(conn, "/members")
-    view |> element("a", "New Member") |> render_click()
+    {:ok, form_view, _html} = live(conn, "/members/new")
 
     form_data = %{
       "member[first_name]" => "Max",
@@ -60,7 +64,13 @@ defmodule MvWeb.MemberLive.IndexTest do
       "member[email]" => "max@example.com"
     }
 
-    view |> form("#member-form", form_data) |> render_submit()
-    assert has_element?(view, "#flash-group", "Member create successfully")
+    # Submit form and follow the redirect to get the flash message
+    {:ok, index_view, _html} = 
+      form_view
+      |> form("#member-form", form_data)
+      |> render_submit()
+      |> follow_redirect(conn, "/members")
+    
+    assert has_element?(index_view, "#flash-group", "Member create successfully")
   end
 end