diff --git a/tests/components/config/test_config_entries.py b/tests/components/config/test_config_entries.py
index 87c712b3716..b624205ce85 100644
--- a/tests/components/config/test_config_entries.py
+++ b/tests/components/config/test_config_entries.py
@@ -120,84 +120,84 @@ async def test_get_entries(hass: HomeAssistant, client, clear_handlers) -> None:
         entry.pop("entry_id")
     assert data == [
         {
+            "disabled_by": None,
             "domain": "comp1",
-            "title": "Test 1",
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
+            "pref_disable_new_entities": False,
+            "pref_disable_polling": False,
+            "reason": None,
             "source": "bla",
             "state": core_ce.ConfigEntryState.NOT_LOADED.value,
-            "supports_reconfigure": False,
             "supports_options": True,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": True,
-            "pref_disable_new_entities": False,
-            "pref_disable_polling": False,
-            "disabled_by": None,
-            "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
+            "title": "Test 1",
         },
         {
+            "disabled_by": None,
             "domain": "comp2",
-            "title": "Test 2",
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
+            "pref_disable_new_entities": False,
+            "pref_disable_polling": False,
+            "reason": "Unsupported API",
             "source": "bla2",
             "state": core_ce.ConfigEntryState.SETUP_ERROR.value,
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
-            "pref_disable_new_entities": False,
-            "pref_disable_polling": False,
-            "disabled_by": None,
-            "reason": "Unsupported API",
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
+            "title": "Test 2",
         },
         {
+            "disabled_by": core_ce.ConfigEntryDisabler.USER,
             "domain": "comp3",
-            "title": "Test 3",
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
+            "pref_disable_new_entities": False,
+            "pref_disable_polling": False,
+            "reason": None,
             "source": "bla3",
             "state": core_ce.ConfigEntryState.NOT_LOADED.value,
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
-            "pref_disable_new_entities": False,
-            "pref_disable_polling": False,
-            "disabled_by": core_ce.ConfigEntryDisabler.USER,
-            "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
+            "title": "Test 3",
         },
         {
+            "disabled_by": None,
             "domain": "comp4",
-            "title": "Test 4",
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
+            "pref_disable_new_entities": False,
+            "pref_disable_polling": False,
+            "reason": None,
             "source": "bla4",
             "state": core_ce.ConfigEntryState.NOT_LOADED.value,
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
-            "pref_disable_new_entities": False,
-            "pref_disable_polling": False,
-            "disabled_by": None,
-            "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
+            "title": "Test 4",
         },
         {
-            "domain": "comp5",
-            "title": "Test 5",
-            "source": "bla5",
-            "state": core_ce.ConfigEntryState.NOT_LOADED.value,
-            "supports_reconfigure": False,
-            "supports_options": False,
-            "supports_remove_device": False,
-            "supports_unload": False,
-            "pref_disable_new_entities": False,
-            "pref_disable_polling": False,
             "disabled_by": None,
-            "reason": None,
+            "domain": "comp5",
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
+            "pref_disable_new_entities": False,
+            "pref_disable_polling": False,
+            "reason": None,
+            "source": "bla5",
+            "state": core_ce.ConfigEntryState.NOT_LOADED.value,
+            "supports_options": False,
+            "supports_reconfigure": False,
+            "supports_remove_device": False,
+            "supports_unload": False,
+            "title": "Test 5",
         },
     ]
 
@@ -540,18 +540,18 @@ async def test_create_account(
             "disabled_by": None,
             "domain": "test",
             "entry_id": entries[0].entry_id,
-            "source": core_ce.SOURCE_USER,
-            "state": core_ce.ConfigEntryState.LOADED.value,
-            "supports_reconfigure": False,
-            "supports_options": False,
-            "supports_remove_device": False,
-            "supports_unload": False,
-            "pref_disable_new_entities": False,
-            "pref_disable_polling": False,
-            "title": "Test Entry",
-            "reason": None,
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
+            "pref_disable_new_entities": False,
+            "pref_disable_polling": False,
+            "reason": None,
+            "source": core_ce.SOURCE_USER,
+            "state": core_ce.ConfigEntryState.LOADED.value,
+            "supports_options": False,
+            "supports_reconfigure": False,
+            "supports_remove_device": False,
+            "supports_unload": False,
+            "title": "Test Entry",
         },
         "description": None,
         "description_placeholders": None,
@@ -621,18 +621,18 @@ async def test_two_step_flow(
                 "disabled_by": None,
                 "domain": "test",
                 "entry_id": entries[0].entry_id,
-                "source": core_ce.SOURCE_USER,
-                "state": core_ce.ConfigEntryState.LOADED.value,
-                "supports_reconfigure": False,
-                "supports_options": False,
-                "supports_remove_device": False,
-                "supports_unload": False,
-                "pref_disable_new_entities": False,
-                "pref_disable_polling": False,
-                "title": "user-title",
-                "reason": None,
                 "error_reason_translation_key": None,
                 "error_reason_translation_placeholders": None,
+                "pref_disable_new_entities": False,
+                "pref_disable_polling": False,
+                "reason": None,
+                "source": core_ce.SOURCE_USER,
+                "state": core_ce.ConfigEntryState.LOADED.value,
+                "supports_options": False,
+                "supports_reconfigure": False,
+                "supports_remove_device": False,
+                "supports_unload": False,
+                "title": "user-title",
             },
             "description": None,
             "description_placeholders": None,
@@ -1073,15 +1073,15 @@ async def test_get_single(
         "disabled_by": None,
         "domain": "test",
         "entry_id": entry.entry_id,
+        "error_reason_translation_key": None,
+        "error_reason_translation_placeholders": None,
         "pref_disable_new_entities": False,
         "pref_disable_polling": False,
         "reason": None,
-        "error_reason_translation_key": None,
-        "error_reason_translation_placeholders": None,
         "source": "user",
         "state": "loaded",
-        "supports_reconfigure": False,
         "supports_options": False,
+        "supports_reconfigure": False,
         "supports_remove_device": False,
         "supports_unload": False,
         "title": "Mock Title",
@@ -1412,15 +1412,15 @@ async def test_get_matching_entries_ws(
             "disabled_by": None,
             "domain": "comp1",
             "entry_id": ANY,
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
             "source": "bla",
             "state": "not_loaded",
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
             "title": "Test 1",
@@ -1429,15 +1429,15 @@ async def test_get_matching_entries_ws(
             "disabled_by": None,
             "domain": "comp2",
             "entry_id": ANY,
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": "Unsupported API",
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
             "source": "bla2",
             "state": "setup_error",
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
             "title": "Test 2",
@@ -1446,15 +1446,15 @@ async def test_get_matching_entries_ws(
             "disabled_by": "user",
             "domain": "comp3",
             "entry_id": ANY,
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
             "source": "bla3",
             "state": "not_loaded",
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
             "title": "Test 3",
@@ -1463,15 +1463,15 @@ async def test_get_matching_entries_ws(
             "disabled_by": None,
             "domain": "comp4",
             "entry_id": ANY,
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
             "source": "bla4",
             "state": "not_loaded",
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
             "title": "Test 4",
@@ -1480,15 +1480,15 @@ async def test_get_matching_entries_ws(
             "disabled_by": None,
             "domain": "comp5",
             "entry_id": ANY,
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
             "source": "bla5",
             "state": "not_loaded",
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
             "title": "Test 5",
@@ -1508,15 +1508,15 @@ async def test_get_matching_entries_ws(
             "disabled_by": None,
             "domain": "comp1",
             "entry_id": ANY,
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
             "source": "bla",
             "state": "not_loaded",
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
             "title": "Test 1",
@@ -1535,15 +1535,15 @@ async def test_get_matching_entries_ws(
             "disabled_by": None,
             "domain": "comp4",
             "entry_id": ANY,
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
             "source": "bla4",
             "state": "not_loaded",
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
             "title": "Test 4",
@@ -1552,15 +1552,15 @@ async def test_get_matching_entries_ws(
             "disabled_by": None,
             "domain": "comp5",
             "entry_id": ANY,
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
             "source": "bla5",
             "state": "not_loaded",
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
             "title": "Test 5",
@@ -1579,15 +1579,15 @@ async def test_get_matching_entries_ws(
             "disabled_by": None,
             "domain": "comp1",
             "entry_id": ANY,
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
             "source": "bla",
             "state": "not_loaded",
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
             "title": "Test 1",
@@ -1596,15 +1596,15 @@ async def test_get_matching_entries_ws(
             "disabled_by": "user",
             "domain": "comp3",
             "entry_id": ANY,
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
             "source": "bla3",
             "state": "not_loaded",
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
             "title": "Test 3",
@@ -1629,15 +1629,15 @@ async def test_get_matching_entries_ws(
             "disabled_by": None,
             "domain": "comp1",
             "entry_id": ANY,
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
             "source": "bla",
             "state": "not_loaded",
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
             "title": "Test 1",
@@ -1646,15 +1646,15 @@ async def test_get_matching_entries_ws(
             "disabled_by": None,
             "domain": "comp2",
             "entry_id": ANY,
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": "Unsupported API",
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
             "source": "bla2",
             "state": "setup_error",
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
             "title": "Test 2",
@@ -1663,15 +1663,15 @@ async def test_get_matching_entries_ws(
             "disabled_by": "user",
             "domain": "comp3",
             "entry_id": ANY,
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
             "source": "bla3",
             "state": "not_loaded",
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
             "title": "Test 3",
@@ -1680,15 +1680,15 @@ async def test_get_matching_entries_ws(
             "disabled_by": None,
             "domain": "comp4",
             "entry_id": ANY,
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
             "source": "bla4",
             "state": "not_loaded",
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
             "title": "Test 4",
@@ -1697,15 +1697,15 @@ async def test_get_matching_entries_ws(
             "disabled_by": None,
             "domain": "comp5",
             "entry_id": ANY,
+            "error_reason_translation_key": None,
+            "error_reason_translation_placeholders": None,
             "pref_disable_new_entities": False,
             "pref_disable_polling": False,
             "reason": None,
-            "error_reason_translation_key": None,
-            "error_reason_translation_placeholders": None,
             "source": "bla5",
             "state": "not_loaded",
-            "supports_reconfigure": False,
             "supports_options": False,
+            "supports_reconfigure": False,
             "supports_remove_device": False,
             "supports_unload": False,
             "title": "Test 5",
@@ -1798,15 +1798,15 @@ async def test_subscribe_entries_ws(
                 "disabled_by": None,
                 "domain": "comp1",
                 "entry_id": ANY,
+                "error_reason_translation_key": None,
+                "error_reason_translation_placeholders": None,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
-                "error_reason_translation_key": None,
-                "error_reason_translation_placeholders": None,
                 "source": "bla",
                 "state": "not_loaded",
-                "supports_reconfigure": False,
                 "supports_options": False,
+                "supports_reconfigure": False,
                 "supports_remove_device": False,
                 "supports_unload": False,
                 "title": "Test 1",
@@ -1818,15 +1818,15 @@ async def test_subscribe_entries_ws(
                 "disabled_by": None,
                 "domain": "comp2",
                 "entry_id": ANY,
+                "error_reason_translation_key": None,
+                "error_reason_translation_placeholders": None,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": "Unsupported API",
-                "error_reason_translation_key": None,
-                "error_reason_translation_placeholders": None,
                 "source": "bla2",
                 "state": "setup_error",
-                "supports_reconfigure": False,
                 "supports_options": False,
+                "supports_reconfigure": False,
                 "supports_remove_device": False,
                 "supports_unload": False,
                 "title": "Test 2",
@@ -1838,15 +1838,15 @@ async def test_subscribe_entries_ws(
                 "disabled_by": "user",
                 "domain": "comp3",
                 "entry_id": ANY,
+                "error_reason_translation_key": None,
+                "error_reason_translation_placeholders": None,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
-                "error_reason_translation_key": None,
-                "error_reason_translation_placeholders": None,
                 "source": "bla3",
                 "state": "not_loaded",
-                "supports_reconfigure": False,
                 "supports_options": False,
+                "supports_reconfigure": False,
                 "supports_remove_device": False,
                 "supports_unload": False,
                 "title": "Test 3",
@@ -1862,15 +1862,15 @@ async def test_subscribe_entries_ws(
                 "disabled_by": None,
                 "domain": "comp1",
                 "entry_id": ANY,
+                "error_reason_translation_key": None,
+                "error_reason_translation_placeholders": None,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
-                "error_reason_translation_key": None,
-                "error_reason_translation_placeholders": None,
                 "source": "bla",
                 "state": "not_loaded",
-                "supports_reconfigure": False,
                 "supports_options": False,
+                "supports_reconfigure": False,
                 "supports_remove_device": False,
                 "supports_unload": False,
                 "title": "changed",
@@ -1887,15 +1887,15 @@ async def test_subscribe_entries_ws(
                 "disabled_by": None,
                 "domain": "comp1",
                 "entry_id": ANY,
+                "error_reason_translation_key": None,
+                "error_reason_translation_placeholders": None,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
-                "error_reason_translation_key": None,
-                "error_reason_translation_placeholders": None,
                 "source": "bla",
                 "state": "not_loaded",
-                "supports_reconfigure": False,
                 "supports_options": False,
+                "supports_reconfigure": False,
                 "supports_remove_device": False,
                 "supports_unload": False,
                 "title": "changed",
@@ -1912,15 +1912,15 @@ async def test_subscribe_entries_ws(
                 "disabled_by": None,
                 "domain": "comp1",
                 "entry_id": ANY,
+                "error_reason_translation_key": None,
+                "error_reason_translation_placeholders": None,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
-                "error_reason_translation_key": None,
-                "error_reason_translation_placeholders": None,
                 "source": "bla",
                 "state": "not_loaded",
-                "supports_reconfigure": False,
                 "supports_options": False,
+                "supports_reconfigure": False,
                 "supports_remove_device": False,
                 "supports_unload": False,
                 "title": "changed",
@@ -1996,15 +1996,15 @@ async def test_subscribe_entries_ws_filtered(
                 "disabled_by": None,
                 "domain": "comp1",
                 "entry_id": ANY,
+                "error_reason_translation_key": None,
+                "error_reason_translation_placeholders": None,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
-                "error_reason_translation_key": None,
-                "error_reason_translation_placeholders": None,
                 "source": "bla",
                 "state": "not_loaded",
-                "supports_reconfigure": False,
                 "supports_options": False,
+                "supports_reconfigure": False,
                 "supports_remove_device": False,
                 "supports_unload": False,
                 "title": "Test 1",
@@ -2016,15 +2016,15 @@ async def test_subscribe_entries_ws_filtered(
                 "disabled_by": "user",
                 "domain": "comp3",
                 "entry_id": ANY,
+                "error_reason_translation_key": None,
+                "error_reason_translation_placeholders": None,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
-                "error_reason_translation_key": None,
-                "error_reason_translation_placeholders": None,
                 "source": "bla3",
                 "state": "not_loaded",
-                "supports_reconfigure": False,
                 "supports_options": False,
+                "supports_reconfigure": False,
                 "supports_remove_device": False,
                 "supports_unload": False,
                 "title": "Test 3",
@@ -2042,15 +2042,15 @@ async def test_subscribe_entries_ws_filtered(
                 "disabled_by": None,
                 "domain": "comp1",
                 "entry_id": ANY,
+                "error_reason_translation_key": None,
+                "error_reason_translation_placeholders": None,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
-                "error_reason_translation_key": None,
-                "error_reason_translation_placeholders": None,
                 "source": "bla",
                 "state": "not_loaded",
-                "supports_reconfigure": False,
                 "supports_options": False,
+                "supports_reconfigure": False,
                 "supports_remove_device": False,
                 "supports_unload": False,
                 "title": "changed",
@@ -2066,15 +2066,15 @@ async def test_subscribe_entries_ws_filtered(
                 "disabled_by": "user",
                 "domain": "comp3",
                 "entry_id": ANY,
+                "error_reason_translation_key": None,
+                "error_reason_translation_placeholders": None,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
-                "error_reason_translation_key": None,
-                "error_reason_translation_placeholders": None,
                 "source": "bla3",
                 "state": "not_loaded",
-                "supports_reconfigure": False,
                 "supports_options": False,
+                "supports_reconfigure": False,
                 "supports_remove_device": False,
                 "supports_unload": False,
                 "title": "changed too",
@@ -2092,15 +2092,15 @@ async def test_subscribe_entries_ws_filtered(
                 "disabled_by": None,
                 "domain": "comp1",
                 "entry_id": ANY,
+                "error_reason_translation_key": None,
+                "error_reason_translation_placeholders": None,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
-                "error_reason_translation_key": None,
-                "error_reason_translation_placeholders": None,
                 "source": "bla",
                 "state": "not_loaded",
-                "supports_reconfigure": False,
                 "supports_options": False,
+                "supports_reconfigure": False,
                 "supports_remove_device": False,
                 "supports_unload": False,
                 "title": "changed",
@@ -2117,15 +2117,15 @@ async def test_subscribe_entries_ws_filtered(
                 "disabled_by": None,
                 "domain": "comp1",
                 "entry_id": ANY,
+                "error_reason_translation_key": None,
+                "error_reason_translation_placeholders": None,
                 "pref_disable_new_entities": False,
                 "pref_disable_polling": False,
                 "reason": None,
-                "error_reason_translation_key": None,
-                "error_reason_translation_placeholders": None,
                 "source": "bla",
                 "state": "not_loaded",
-                "supports_reconfigure": False,
                 "supports_options": False,
+                "supports_reconfigure": False,
                 "supports_remove_device": False,
                 "supports_unload": False,
                 "title": "changed",
@@ -2291,18 +2291,18 @@ async def test_supports_reconfigure(
             "disabled_by": None,
             "domain": "test",
             "entry_id": entries[0].entry_id,
-            "source": core_ce.SOURCE_RECONFIGURE,
-            "state": core_ce.ConfigEntryState.LOADED.value,
-            "supports_reconfigure": True,
-            "supports_options": False,
-            "supports_remove_device": False,
-            "supports_unload": False,
-            "pref_disable_new_entities": False,
-            "pref_disable_polling": False,
-            "title": "Test Entry",
-            "reason": None,
             "error_reason_translation_key": None,
             "error_reason_translation_placeholders": None,
+            "pref_disable_new_entities": False,
+            "pref_disable_polling": False,
+            "reason": None,
+            "source": core_ce.SOURCE_RECONFIGURE,
+            "state": core_ce.ConfigEntryState.LOADED.value,
+            "supports_options": False,
+            "supports_reconfigure": True,
+            "supports_remove_device": False,
+            "supports_unload": False,
+            "title": "Test Entry",
         },
         "description": None,
         "description_placeholders": None,