diff --git a/requirements_test.txt b/requirements_test.txt
index cf3522dcbb8..a46c7e09c90 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,6 +1,7 @@
 --requirement requirements_base.txt
 asynctest==0.13.0
 freezegun==1.5.1
+josepy<2
 pytest==8.3.4
 pytest-asyncio==0.25.3
 pytest-cov==6.0.0
diff --git a/tests/common.py b/tests/common.py
index 0e68c347603..17a416faf3a 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -567,6 +567,7 @@ def create_config_entry(
     # legacy workaround for tests
     if AwesomeVersion(HA_VERSION).dev:
         config_entry_data["discovery_keys"] = {}
+        config_entry_data["subentries_data"] = None
     return MockConfigEntry(**config_entry_data)
 
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 8d89da6e959..a2587ce3223 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -326,7 +326,8 @@ def _entity_state(entity: er.RegistryEntry) -> dict[str, Any]:
                         ),
                         **(additional or {}),
                     },
-                    ("categories", "config_entry_id", "device_id", "labels"),
+                    ("categories", "config_entry_id",
+                     "device_id", "labels", "config_subentry_id"),
                 ),
             ),
             filename,
diff --git a/tests/test_config_flow.py b/tests/test_config_flow.py
index 8b7cd05cd17..c347e4be9a2 100644
--- a/tests/test_config_flow.py
+++ b/tests/test_config_flow.py
@@ -112,7 +112,7 @@ async def json(**kwargs):
 
     snapshots.assert_match(
         safe_json_dumps(recursive_remove_key(
-            result, ("flow_id", "minor_version"))),
+            result, ("flow_id", "minor_version", "subentries"))),
         "config_flow/test_full_user_flow_implementation.json",
     )
 
diff --git a/tests/test_diagnostics.py b/tests/test_diagnostics.py
index 21108c1bb14..ef67a9f31e1 100644
--- a/tests/test_diagnostics.py
+++ b/tests/test_diagnostics.py
@@ -13,7 +13,7 @@
 from tests.conftest import SnapshotFixture
 
 REMOVE_KEYS = ("entry_id", "last_updated", "local", "minor_version",
-               "created_at", "modified_at", "discovery_keys")
+               "created_at", "modified_at", "discovery_keys", "subentries_data", "subentries")
 
 
 async def test_diagnostics(hacs: HacsBase, snapshots: SnapshotFixture):