diff --git a/homeassistant/components/onvif/diagnostics.py b/homeassistant/components/onvif/diagnostics.py
index d7f2c515308..a802aed5e80 100644
--- a/homeassistant/components/onvif/diagnostics.py
+++ b/homeassistant/components/onvif/diagnostics.py
@@ -27,6 +27,10 @@ async def async_get_config_entry_diagnostics(
         "info": asdict(device.info),
         "capabilities": asdict(device.capabilities),
         "profiles": [asdict(profile) for profile in device.profiles],
+        "services": {
+            str(key): service.url for key, service in device.device.services.items()
+        },
+        "xaddrs": device.device.xaddrs,
     }
     data["events"] = {
         "webhook_manager_state": device.events.webhook_manager.state,
diff --git a/tests/components/onvif/__init__.py b/tests/components/onvif/__init__.py
index a56e0a477e7..598546a6417 100644
--- a/tests/components/onvif/__init__.py
+++ b/tests/components/onvif/__init__.py
@@ -101,6 +101,8 @@ def setup_mock_onvif_camera(
     mock_onvif_camera.create_devicemgmt_service = AsyncMock(return_value=devicemgmt)
     mock_onvif_camera.create_media_service = AsyncMock(return_value=media_service)
     mock_onvif_camera.close = AsyncMock(return_value=None)
+    mock_onvif_camera.xaddrs = {}
+    mock_onvif_camera.services = {}
 
     def mock_constructor(
         host,
diff --git a/tests/components/onvif/test_diagnostics.py b/tests/components/onvif/test_diagnostics.py
index 70dafe960b4..2ab2deb6884 100644
--- a/tests/components/onvif/test_diagnostics.py
+++ b/tests/components/onvif/test_diagnostics.py
@@ -1,4 +1,6 @@
 """Test ONVIF diagnostics."""
+from unittest.mock import ANY
+
 from homeassistant.core import HomeAssistant
 
 from . import (
@@ -71,6 +73,8 @@ async def test_diagnostics(
                     "video_source_token": None,
                 }
             ],
+            "services": ANY,
+            "xaddrs": ANY,
         },
         "events": {
             "pullpoint_manager_state": {