diff --git a/lib/aprsme/telemetry/database_metrics.ex b/lib/aprsme/telemetry/database_metrics.ex
index ab7bec4..bfd9b14 100644
--- a/lib/aprsme/telemetry/database_metrics.ex
+++ b/lib/aprsme/telemetry/database_metrics.ex
@@ -125,6 +125,15 @@ defmodule Aprsme.Telemetry.DatabaseMetrics do
   end
 
   def collect_postgres_metrics do
+    # Skip database metrics collection in test environment
+    if Application.get_env(:aprsme, :env) == :test do
+      :ok
+    else
+      do_collect_postgres_metrics()
+    end
+  end
+
+  defp do_collect_postgres_metrics do
     # Database size
     case Aprsme.Repo.query("SELECT pg_database_size(current_database()) as size") do
       {:ok, %{rows: [[size]]}} ->
diff --git a/test/aprsme_web/live/user_registration_live_test.exs b/test/aprsme_web/live/user_registration_live_test.exs
index 8ce7c7d..4bd0780 100644
--- a/test/aprsme_web/live/user_registration_live_test.exs
+++ b/test/aprsme_web/live/user_registration_live_test.exs
@@ -77,7 +77,7 @@ defmodule AprsmeWeb.UserRegistrationLiveTest do
 
       {:ok, _login_live, login_html} =
         lv
-        |> element(~s|main a:fl-contains("Sign in")|)
+        |> element(~s|main a[href="/users/log_in"]|)
         |> render_click()
         |> follow_redirect(conn, ~p"/users/log_in")