diff --git a/homeassistant/data_entry_flow.py b/homeassistant/data_entry_flow.py
index e5ee5a79922..251e22e7990 100644
--- a/homeassistant/data_entry_flow.py
+++ b/homeassistant/data_entry_flow.py
@@ -561,7 +561,7 @@ class FlowManager(abc.ABC, Generic[_FlowContextT, _FlowResultT, _HandlerT]):
         if not hasattr(flow, method):
             self._async_remove_flow_progress(flow.flow_id)
             raise UnknownStep(
-                f"Handler {self.__class__.__name__} doesn't support step {step_id}"
+                f"Handler {flow.__class__.__name__} doesn't support step {step_id}"
             )
 
     async def _async_setup_preview(
diff --git a/tests/components/config/test_config_entries.py b/tests/components/config/test_config_entries.py
index 9b5ff3c9f3e..28161c0182c 100644
--- a/tests/components/config/test_config_entries.py
+++ b/tests/components/config/test_config_entries.py
@@ -2887,9 +2887,7 @@ async def test_does_not_support_reconfigure(
 
     assert resp.status == HTTPStatus.BAD_REQUEST
     response = await resp.json()
-    assert response == {
-        "message": "Handler ConfigEntriesFlowManager doesn't support step reconfigure"
-    }
+    assert response == {"message": "Handler TestFlow doesn't support step reconfigure"}
 
 
 async def test_list_subentries(