diff --git a/test/mv_web/member_live/index_membership_fee_status_test.exs b/test/mv_web/member_live/index_membership_fee_status_test.exs
index a37f7e3..baa5f67 100644
--- a/test/mv_web/member_live/index_membership_fee_status_test.exs
+++ b/test/mv_web/member_live/index_membership_fee_status_test.exs
@@ -120,7 +120,7 @@ defmodule MvWeb.MemberLive.IndexMembershipFeeStatusTest do
 
       # Toggle to current cycle (use the button in the header, not the one in the column)
       view
-      |> element("button[phx-click='toggle_cycle_view'].btn-sm")
+      |> element("button[phx-click='toggle_cycle_view'].btn.gap-2")
       |> render_click()
 
       html = render(view)
@@ -200,7 +200,7 @@ defmodule MvWeb.MemberLive.IndexMembershipFeeStatusTest do
       refute Enum.empty?(cycles1)
       refute Enum.empty?(cycles2)
 
-      {:ok, _view, html} = live(conn, "/members?membership_fee_filter=unpaid_last")
+      {:ok, _view, html} = live(conn, "/members?cycle_status_filter=unpaid")
 
       assert html =~ "UnpaidMember"
       refute html =~ "PaidMember"
@@ -234,7 +234,8 @@ defmodule MvWeb.MemberLive.IndexMembershipFeeStatusTest do
       refute Enum.empty?(cycles1)
       refute Enum.empty?(cycles2)
 
-      {:ok, _view, html} = live(conn, "/members?membership_fee_filter=unpaid_current")
+      {:ok, _view, html} =
+        live(conn, "/members?cycle_status_filter=unpaid&show_current_cycle=true")
 
       assert html =~ "UnpaidCurrent"
       refute html =~ "PaidCurrent"
diff --git a/test/mv_web/member_live/membership_fee_integration_test.exs b/test/mv_web/member_live/membership_fee_integration_test.exs
index d07f677..e76e422 100644
--- a/test/mv_web/member_live/membership_fee_integration_test.exs
+++ b/test/mv_web/member_live/membership_fee_integration_test.exs
@@ -219,9 +219,9 @@ defmodule MvWeb.MemberLive.MembershipFeeIntegrationTest do
       |> element("button[phx-click='switch_tab'][phx-value-tab='membership_fees']")
       |> render_click()
 
-      # Open edit modal
+      # Open edit modal by clicking on the amount span
       view
-      |> element("button[phx-click='edit_cycle_amount'][phx-value-cycle_id='#{cycle.id}']")
+      |> element("span[phx-click='edit_cycle_amount'][phx-value-cycle_id='#{cycle.id}']")
       |> render_click()
 
       # Update amount