diff --git a/tests/components/dlna_dmr/conftest.py b/tests/components/dlna_dmr/conftest.py
index 81225173d51..9e9bcbf3056 100644
--- a/tests/components/dlna_dmr/conftest.py
+++ b/tests/components/dlna_dmr/conftest.py
@@ -74,8 +74,8 @@ def domain_data_mock(hass: HomeAssistant) -> Iterable[Mock]:
     seal(upnp_device)
     domain_data.upnp_factory.async_create_device.return_value = upnp_device
 
-    with patch.dict(hass.data, {DLNA_DOMAIN: domain_data}):
-        yield domain_data
+    hass.data[DLNA_DOMAIN] = domain_data
+    return domain_data
 
 
 @pytest.fixture
@@ -129,6 +129,7 @@ def dmr_device_mock(domain_data_mock: Mock) -> Iterable[Mock]:
         device.manufacturer = "device_manufacturer"
         device.model_name = "device_model_name"
         device.name = "device_name"
+        device.preset_names = ["preset1", "preset2"]
 
         yield device
 
diff --git a/tests/components/dlna_dmr/test_config_flow.py b/tests/components/dlna_dmr/test_config_flow.py
index be49a6ca257..d9b1d60708b 100644
--- a/tests/components/dlna_dmr/test_config_flow.py
+++ b/tests/components/dlna_dmr/test_config_flow.py
@@ -97,6 +97,15 @@ def mock_get_mac_address() -> Iterable[Mock]:
         yield gma_mock
 
 
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Iterable[Mock]:
+    """Mock async_setup_entry."""
+    with patch(
+        "homeassistant.components.dlna_dmr.async_setup_entry", return_value=True
+    ) as setup_entry_mock:
+        yield setup_entry_mock
+
+
 async def test_user_flow_undiscovered_manual(hass: HomeAssistant) -> None:
     """Test user-init'd flow, no discovered devices, user entering a valid URL."""
     result = await hass.config_entries.flow.async_init(
@@ -120,9 +129,6 @@ async def test_user_flow_undiscovered_manual(hass: HomeAssistant) -> None:
     }
     assert result["options"] == {CONF_POLL_AVAILABILITY: True}
 
-    # Wait for platform to be fully setup
-    await hass.async_block_till_done()
-
 
 async def test_user_flow_discovered_manual(
     hass: HomeAssistant, ssdp_scanner_mock: Mock
@@ -163,9 +169,6 @@ async def test_user_flow_discovered_manual(
     }
     assert result["options"] == {CONF_POLL_AVAILABILITY: True}
 
-    # Wait for platform to be fully setup
-    await hass.async_block_till_done()
-
 
 async def test_user_flow_selected(hass: HomeAssistant, ssdp_scanner_mock: Mock) -> None:
     """Test user-init'd flow, user selects discovered device."""
@@ -196,8 +199,6 @@ async def test_user_flow_selected(hass: HomeAssistant, ssdp_scanner_mock: Mock)
     }
     assert result["options"] == {}
 
-    await hass.async_block_till_done()
-
 
 async def test_user_flow_uncontactable(
     hass: HomeAssistant, domain_data_mock: Mock
@@ -260,9 +261,6 @@ async def test_user_flow_embedded_st(
     }
     assert result["options"] == {CONF_POLL_AVAILABILITY: True}
 
-    # Wait for platform to be fully setup
-    await hass.async_block_till_done()
-
 
 async def test_user_flow_wrong_st(hass: HomeAssistant, domain_data_mock: Mock) -> None:
     """Test user-init'd config flow with user entering a URL for the wrong device."""
@@ -717,9 +715,6 @@ async def test_unignore_flow(hass: HomeAssistant, ssdp_scanner_mock: Mock) -> No
     }
     assert result["options"] == {}
 
-    # Wait for platform to be fully setup
-    await hass.async_block_till_done()
-
 
 async def test_unignore_flow_offline(
     hass: HomeAssistant, ssdp_scanner_mock: Mock
diff --git a/tests/components/dlna_dmr/test_media_player.py b/tests/components/dlna_dmr/test_media_player.py
index f8413e8f620..51128b161fb 100644
--- a/tests/components/dlna_dmr/test_media_player.py
+++ b/tests/components/dlna_dmr/test_media_player.py
@@ -26,7 +26,6 @@ from homeassistant.components.dlna_dmr.const import (
     CONF_CALLBACK_URL_OVERRIDE,
     CONF_LISTEN_PORT,
     CONF_POLL_AVAILABILITY,
-    DOMAIN as DLNA_DOMAIN,
 )
 from homeassistant.components.dlna_dmr.data import EventListenAddr
 from homeassistant.components.dlna_dmr.media_player import DlnaDmrEntity
@@ -81,7 +80,7 @@ pytestmark = pytest.mark.usefixtures("domain_data_mock")
 async def setup_mock_component(hass: HomeAssistant, mock_entry: MockConfigEntry) -> str:
     """Set up a mock DlnaDmrEntity with the given configuration."""
     mock_entry.add_to_hass(hass)
-    assert await async_setup_component(hass, DLNA_DOMAIN, {}) is True
+    assert await hass.config_entries.async_setup(mock_entry.entry_id) is True
     await hass.async_block_till_done()
 
     entries = async_entries_for_config_entry(async_get_er(hass), mock_entry.entry_id)