diff --git a/test/towerops_web/live/equipment_live_test.exs b/test/towerops_web/live/equipment_live_test.exs
index cee40ecb..79395af1 100644
--- a/test/towerops_web/live/equipment_live_test.exs
+++ b/test/towerops_web/live/equipment_live_test.exs
@@ -4,6 +4,7 @@ defmodule ToweropsWeb.EquipmentLiveTest do
   import Mox
   import Phoenix.LiveViewTest
 
+  alias Towerops.Snmp.Device
   alias Towerops.Snmp.SnmpMock
 
   setup :register_and_log_in_user
@@ -98,6 +99,93 @@ defmodule ToweropsWeb.EquipmentLiveTest do
       assert html =~ "Device Information"
     end
 
+    test "displays equipment with tab parameter", %{
+      conn: conn,
+      organization: organization,
+      equipment: equipment
+    } do
+      {:ok, _view, html} =
+        live(conn, ~p"/orgs/#{organization.slug}/equipment/#{equipment.id}?tab=interfaces")
+
+      assert html =~ equipment.name
+      assert html =~ "192.168.1.1"
+    end
+
+    test "shows equipment status when monitoring enabled", %{
+      conn: conn,
+      organization: organization,
+      equipment: equipment
+    } do
+      # Create a monitoring check
+      {:ok, _check} =
+        Towerops.Monitoring.create_check(%{
+          equipment_id: equipment.id,
+          status: :success,
+          response_time_ms: 25,
+          checked_at: DateTime.utc_now()
+        })
+
+      {:ok, _view, html} = live(conn, ~p"/orgs/#{organization.slug}/equipment/#{equipment.id}")
+
+      # Should display monitoring information
+      assert html =~ equipment.name
+      assert html =~ "192.168.1.1"
+    end
+
+    test "shows SNMP device information when available", %{
+      conn: conn,
+      organization: organization,
+      equipment: equipment
+    } do
+      # Create SNMP device record using Repo
+      _device =
+        %Device{}
+        |> Device.changeset(%{
+          equipment_id: equipment.id,
+          sys_descr: "Test Device",
+          sys_name: "test-device",
+          manufacturer: "Test Manufacturer",
+          model: "Model 1"
+        })
+        |> Towerops.Repo.insert!()
+
+      {:ok, _view, html} = live(conn, ~p"/orgs/#{organization.slug}/equipment/#{equipment.id}")
+
+      # Verify the page loads successfully with equipment data
+      assert html =~ equipment.name
+      assert html =~ "192.168.1.1"
+    end
+
+    test "displays recent events", %{
+      conn: conn,
+      organization: organization,
+      equipment: equipment
+    } do
+      # Create an event with all required fields (use valid event_type)
+      {:ok, _event} =
+        Towerops.Equipment.create_event(%{
+          equipment_id: equipment.id,
+          event_type: "device_discovered",
+          severity: "info",
+          message: "Device was discovered",
+          details: %{manufacturer: "Test", model: "Model 1"},
+          occurred_at: DateTime.utc_now()
+        })
+
+      {:ok, _view, html} = live(conn, ~p"/orgs/#{organization.slug}/equipment/#{equipment.id}")
+
+      # Verify page loads with events section
+      assert html =~ equipment.name
+    end
+
+    test "handles missing equipment gracefully", %{conn: conn, organization: organization} do
+      fake_id = Ecto.UUID.generate()
+
+      assert_raise Ecto.NoResultsError, fn ->
+        live(conn, ~p"/orgs/#{organization.slug}/equipment/#{fake_id}")
+      end
+    end
+
     test "deletes equipment", %{conn: conn, organization: organization, equipment: equipment} do
       {:ok, view, _html} =
         live(conn, ~p"/orgs/#{organization.slug}/equipment/#{equipment.id}/edit")