diff --git a/homeassistant/components/media_source/__init__.py b/homeassistant/components/media_source/__init__.py
index 62cf7815613..fdb7fa5f1f2 100644
--- a/homeassistant/components/media_source/__init__.py
+++ b/homeassistant/components/media_source/__init__.py
@@ -148,7 +148,10 @@ async def async_resolve_media(
         raise Unresolvable("Media Source not loaded")
 
     if target_media_player is UNDEFINED:
-        report("calls media_source.async_resolve_media without passing an entity_id")
+        report(
+            "calls media_source.async_resolve_media without passing an entity_id",
+            {DOMAIN},
+        )
         target_media_player = None
 
     try:
diff --git a/tests/components/jellyfin/test_media_source.py b/tests/components/jellyfin/test_media_source.py
index 5f8871e6242..e87b3c15b0b 100644
--- a/tests/components/jellyfin/test_media_source.py
+++ b/tests/components/jellyfin/test_media_source.py
@@ -40,7 +40,9 @@ async def test_resolve(
     mock_api.get_item.side_effect = None
     mock_api.get_item.return_value = load_json_fixture("track.json")
 
-    play_media = await async_resolve_media(hass, f"{URI_SCHEME}{DOMAIN}/TRACK-UUID")
+    play_media = await async_resolve_media(
+        hass, f"{URI_SCHEME}{DOMAIN}/TRACK-UUID", "media_player.jellyfin_device"
+    )
 
     assert play_media.mime_type == "audio/flac"
     assert play_media.url == snapshot
@@ -49,7 +51,9 @@ async def test_resolve(
     mock_api.get_item.side_effect = None
     mock_api.get_item.return_value = load_json_fixture("movie.json")
 
-    play_media = await async_resolve_media(hass, f"{URI_SCHEME}{DOMAIN}/MOVIE-UUID")
+    play_media = await async_resolve_media(
+        hass, f"{URI_SCHEME}{DOMAIN}/MOVIE-UUID", "media_player.jellyfin_device"
+    )
 
     assert play_media.mime_type == "video/mp4"
     assert play_media.url == snapshot
@@ -59,7 +63,11 @@ async def test_resolve(
     mock_api.get_item.return_value = load_json_fixture("unsupported-item.json")
 
     with pytest.raises(BrowseError):
-        await async_resolve_media(hass, f"{URI_SCHEME}{DOMAIN}/UNSUPPORTED-ITEM-UUID")
+        await async_resolve_media(
+            hass,
+            f"{URI_SCHEME}{DOMAIN}/UNSUPPORTED-ITEM-UUID",
+            "media_player.jellyfin_device",
+        )
 
 
 async def test_root(
diff --git a/tests/components/media_source/test_init.py b/tests/components/media_source/test_init.py
index 4e512608abf..eecfe6cde6e 100644
--- a/tests/components/media_source/test_init.py
+++ b/tests/components/media_source/test_init.py
@@ -121,17 +121,13 @@ async def test_async_resolve_media_no_entity(
     assert await async_setup_component(hass, media_source.DOMAIN, {})
     await hass.async_block_till_done()
 
-    media = await media_source.async_resolve_media(
-        hass,
-        media_source.generate_media_source_id(media_source.DOMAIN, "local/test.mp3"),
-    )
-    assert isinstance(media, media_source.models.PlayMedia)
-    assert media.url == "/media/local/test.mp3"
-    assert media.mime_type == "audio/mpeg"
-    assert (
-        "calls media_source.async_resolve_media without passing an entity_id"
-        in caplog.text
-    )
+    with pytest.raises(RuntimeError):
+        await media_source.async_resolve_media(
+            hass,
+            media_source.generate_media_source_id(
+                media_source.DOMAIN, "local/test.mp3"
+            ),
+        )
 
 
 async def test_async_unresolve_media(hass: HomeAssistant) -> None:
diff --git a/tests/components/reolink/test_media_source.py b/tests/components/reolink/test_media_source.py
index ddb66463419..c7abc5b8e0e 100644
--- a/tests/components/reolink/test_media_source.py
+++ b/tests/components/reolink/test_media_source.py
@@ -81,7 +81,9 @@ async def test_resolve(
         f"FILE|{config_entry.entry_id}|{TEST_CHANNEL}|{TEST_STREAM}|{TEST_FILE_NAME}"
     )
 
-    play_media = await async_resolve_media(hass, f"{URI_SCHEME}{DOMAIN}/{file_id}")
+    play_media = await async_resolve_media(
+        hass, f"{URI_SCHEME}{DOMAIN}/{file_id}", None
+    )
 
     assert play_media.mime_type == TEST_MIME_TYPE
 
@@ -245,7 +247,7 @@ async def test_browsing_errors(
     with pytest.raises(Unresolvable):
         await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}/UNKNOWN")
     with pytest.raises(Unresolvable):
-        await async_resolve_media(hass, f"{URI_SCHEME}{DOMAIN}/UNKNOWN")
+        await async_resolve_media(hass, f"{URI_SCHEME}{DOMAIN}/UNKNOWN", None)
 
 
 async def test_browsing_not_loaded(