diff --git a/test/music_library/scrobble_rules_test.exs b/test/music_library/scrobble_rules_test.exs
index 0dc41843..f0a3e409 100644
--- a/test/music_library/scrobble_rules_test.exs
+++ b/test/music_library/scrobble_rules_test.exs
@@ -119,6 +119,75 @@ defmodule MusicLibrary.ScrobbleRulesTest do
 
       assert ScrobbleRules.list_enabled_rules() == [enabled_rule]
     end
+
+    test "list_scrobble_rules/1 filters by query on match_value" do
+      rule = scrobble_rule_fixture(@valid_album_attrs)
+
+      _other =
+        scrobble_rule_fixture(%{
+          match_value: "Unrelated Album",
+          description: "Other rule"
+        })
+
+      assert ScrobbleRules.list_scrobble_rules(query: "Dark Side") == [rule]
+    end
+
+    test "list_scrobble_rules/1 filters by query on target_musicbrainz_id" do
+      rule = scrobble_rule_fixture(@valid_album_attrs)
+
+      _other =
+        scrobble_rule_fixture(%{
+          match_value: "Unrelated Album",
+          target_musicbrainz_id: "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
+          description: "Other rule"
+        })
+
+      assert ScrobbleRules.list_scrobble_rules(query: "12345678") == [rule]
+    end
+
+    test "list_scrobble_rules/1 filters by query on description" do
+      rule = scrobble_rule_fixture(@valid_album_attrs)
+      _other = scrobble_rule_fixture(%{match_value: "Unrelated Album", description: "Other rule"})
+
+      assert ScrobbleRules.list_scrobble_rules(query: "Fix Pink Floyd album") == [rule]
+    end
+
+    test "count_scrobble_rules/1 filters by query" do
+      _rule = scrobble_rule_fixture(@valid_album_attrs)
+      _other = scrobble_rule_fixture(%{match_value: "Unrelated Album", description: "Other rule"})
+
+      assert ScrobbleRules.count_scrobble_rules(query: "Dark Side") == 1
+      assert ScrobbleRules.count_scrobble_rules(query: "") == 2
+      assert ScrobbleRules.count_scrobble_rules() == 2
+    end
+
+    test "list_scrobble_rules/1 orders alphabetically" do
+      rule_b = scrobble_rule_fixture(%{match_value: "Beta Album"})
+      rule_a = scrobble_rule_fixture(%{match_value: "Alpha Album"})
+
+      assert ScrobbleRules.list_scrobble_rules(order: :alphabetical) == [rule_a, rule_b]
+    end
+
+    test "list_scrobble_rules/1 orders by inserted_at descending by default" do
+      rule_first = scrobble_rule_fixture(%{match_value: "First Album"})
+      rule_second = scrobble_rule_fixture(%{match_value: "Second Album"})
+
+      # Both may have the same inserted_at due to SQLite second precision,
+      # so set them explicitly
+      import Ecto.Query
+
+      now = DateTime.utc_now()
+      earlier = DateTime.add(now, -60, :second)
+
+      from(r in ScrobbleRule, where: r.id == ^rule_first.id)
+      |> Repo.update_all(set: [inserted_at: earlier])
+
+      from(r in ScrobbleRule, where: r.id == ^rule_second.id)
+      |> Repo.update_all(set: [inserted_at: now])
+
+      rules = ScrobbleRules.list_scrobble_rules(order: :inserted_at)
+      assert Enum.map(rules, & &1.id) == [rule_second.id, rule_first.id]
+    end
   end
 
   describe "rule application" do
diff --git a/test/music_library_web/live/scrobble_rules_live/index_test.exs b/test/music_library_web/live/scrobble_rules_live/index_test.exs
index 474e6ad2..e566856b 100644
--- a/test/music_library_web/live/scrobble_rules_live/index_test.exs
+++ b/test/music_library_web/live/scrobble_rules_live/index_test.exs
@@ -130,6 +130,43 @@ defmodule MusicLibraryWeb.ScrobbleRulesLiveTest do
       # Should show success message
       assert render(index_live) =~ "All rules applied successfully"
     end
+
+    test "searches scrobble rules by match_value", %{conn: conn, scrobble_rule: scrobble_rule} do
+      _other_rule =
+        MusicLibrary.ScrobbleRulesFixtures.scrobble_rule_fixture(%{
+          match_value: "Unrelated Album"
+        })
+
+      {:ok, index_live, _html} = live(conn, ~p"/scrobble-rules")
+
+      index_live
+      |> form("form[phx-change='search']", query: scrobble_rule.match_value)
+      |> render_change()
+
+      assert_patch(index_live)
+
+      html = render(index_live)
+      assert html =~ scrobble_rule.match_value
+      refute html =~ "Unrelated Album"
+    end
+
+    test "switches sort order", %{conn: conn} do
+      {:ok, index_live, _html} = live(conn, ~p"/scrobble-rules")
+
+      # Switch to alphabetical
+      index_live
+      |> element("a[href*='order=alphabetical']")
+      |> render_click()
+
+      assert_patch(index_live)
+
+      # Switch back to inserted_at
+      index_live
+      |> element("a[href*='order=inserted_at']")
+      |> render_click()
+
+      assert_patch(index_live)
+    end
   end
 
   test "updates form labels based on rule type", %{conn: conn} do