diff --git a/tests/components/wled/test_config_flow.py b/tests/components/wled/test_config_flow.py
index 60f2c59ecba..e828c632451 100644
--- a/tests/components/wled/test_config_flow.py
+++ b/tests/components/wled/test_config_flow.py
@@ -4,11 +4,15 @@ from unittest.mock import MagicMock, patch
 import aiohttp
 from wled import WLEDConnectionError
 
-from homeassistant import data_entry_flow
-from homeassistant.components.wled import config_flow
+from homeassistant.components.wled.const import DOMAIN
 from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF
 from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, CONTENT_TYPE_JSON
 from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import (
+    RESULT_TYPE_ABORT,
+    RESULT_TYPE_CREATE_ENTRY,
+    RESULT_TYPE_FORM,
+)
 
 from . import init_integration
 
@@ -16,163 +20,8 @@ from tests.common import load_fixture
 from tests.test_util.aiohttp import AiohttpClientMocker
 
 
-async def test_show_user_form(hass: HomeAssistant) -> None:
-    """Test that the user set up form is served."""
-    result = await hass.config_entries.flow.async_init(
-        config_flow.DOMAIN,
-        context={"source": SOURCE_USER},
-    )
-
-    assert result["step_id"] == "user"
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-
-
-async def test_show_zeroconf_confirm_form(hass: HomeAssistant) -> None:
-    """Test that the zeroconf confirmation form is served."""
-    flow = config_flow.WLEDFlowHandler()
-    flow.hass = hass
-    flow.context = {"source": SOURCE_ZEROCONF, CONF_NAME: "test"}
-    result = await flow.async_step_zeroconf_confirm()
-
-    assert result["description_placeholders"] == {CONF_NAME: "test"}
-    assert result["step_id"] == "zeroconf_confirm"
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-
-
-async def test_show_zerconf_form(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test that the zeroconf confirmation form is served."""
-    aioclient_mock.get(
-        "http://192.168.1.123:80/json/",
-        text=load_fixture("wled/rgb.json"),
-        headers={"Content-Type": CONTENT_TYPE_JSON},
-    )
-
-    flow = config_flow.WLEDFlowHandler()
-    flow.hass = hass
-    flow.context = {"source": SOURCE_ZEROCONF}
-    result = await flow.async_step_zeroconf(
-        {"host": "192.168.1.123", "hostname": "example.local.", "properties": {}}
-    )
-
-    assert flow.context[CONF_HOST] == "192.168.1.123"
-    assert flow.context[CONF_NAME] == "example"
-    assert result["description_placeholders"] == {CONF_NAME: "example"}
-    assert result["step_id"] == "zeroconf_confirm"
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-
-
-@patch("homeassistant.components.wled.WLED.update", side_effect=WLEDConnectionError)
-async def test_connection_error(
-    update_mock: MagicMock, hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test we show user form on WLED connection error."""
-    aioclient_mock.get("http://example.com/json/", exc=aiohttp.ClientError)
-
-    result = await hass.config_entries.flow.async_init(
-        config_flow.DOMAIN,
-        context={"source": SOURCE_USER},
-        data={CONF_HOST: "example.com"},
-    )
-
-    assert result["errors"] == {"base": "cannot_connect"}
-    assert result["step_id"] == "user"
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-
-
-@patch("homeassistant.components.wled.WLED.update", side_effect=WLEDConnectionError)
-async def test_zeroconf_connection_error(
-    update_mock: MagicMock, hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test we abort zeroconf flow on WLED connection error."""
-    aioclient_mock.get("http://192.168.1.123/json/", exc=aiohttp.ClientError)
-
-    result = await hass.config_entries.flow.async_init(
-        config_flow.DOMAIN,
-        context={"source": SOURCE_ZEROCONF},
-        data={"host": "192.168.1.123", "hostname": "example.local.", "properties": {}},
-    )
-
-    assert result["reason"] == "cannot_connect"
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-
-
-@patch("homeassistant.components.wled.WLED.update", side_effect=WLEDConnectionError)
-async def test_zeroconf_confirm_connection_error(
-    update_mock: MagicMock, hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test we abort zeroconf flow on WLED connection error."""
-    aioclient_mock.get("http://192.168.1.123:80/json/", exc=aiohttp.ClientError)
-
-    result = await hass.config_entries.flow.async_init(
-        config_flow.DOMAIN,
-        context={
-            "source": SOURCE_ZEROCONF,
-            CONF_HOST: "example.com",
-            CONF_NAME: "test",
-        },
-        data={"host": "192.168.1.123", "hostname": "example.com.", "properties": {}},
-    )
-
-    assert result["reason"] == "cannot_connect"
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-
-
-async def test_user_device_exists_abort(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test we abort zeroconf flow if WLED device already configured."""
-    await init_integration(hass, aioclient_mock)
-
-    result = await hass.config_entries.flow.async_init(
-        config_flow.DOMAIN,
-        context={"source": SOURCE_USER},
-        data={CONF_HOST: "192.168.1.123"},
-    )
-
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_configured"
-
-
-async def test_zeroconf_device_exists_abort(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test we abort zeroconf flow if WLED device already configured."""
-    await init_integration(hass, aioclient_mock)
-
-    result = await hass.config_entries.flow.async_init(
-        config_flow.DOMAIN,
-        context={"source": SOURCE_ZEROCONF},
-        data={"host": "192.168.1.123", "hostname": "example.local.", "properties": {}},
-    )
-
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_configured"
-
-
-async def test_zeroconf_with_mac_device_exists_abort(
-    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test we abort zeroconf flow if WLED device already configured."""
-    await init_integration(hass, aioclient_mock)
-
-    result = await hass.config_entries.flow.async_init(
-        config_flow.DOMAIN,
-        context={"source": SOURCE_ZEROCONF},
-        data={
-            "host": "192.168.1.123",
-            "hostname": "example.local.",
-            "properties": {CONF_MAC: "aabbccddeeff"},
-        },
-    )
-
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_configured"
-
-
 async def test_full_user_flow_implementation(
-    hass: HomeAssistant, aioclient_mock
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
 ) -> None:
     """Test the full manual user flow from start to finish."""
     aioclient_mock.get(
@@ -182,21 +31,23 @@ async def test_full_user_flow_implementation(
     )
 
     result = await hass.config_entries.flow.async_init(
-        config_flow.DOMAIN,
+        DOMAIN,
         context={"source": SOURCE_USER},
     )
 
-    assert result["step_id"] == "user"
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result.get("step_id") == "user"
+    assert result.get("type") == RESULT_TYPE_FORM
+    assert "flow_id" in result
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"], user_input={CONF_HOST: "192.168.1.123"}
     )
 
+    assert result.get("title") == "192.168.1.123"
+    assert result.get("type") == RESULT_TYPE_CREATE_ENTRY
+    assert "data" in result
     assert result["data"][CONF_HOST] == "192.168.1.123"
     assert result["data"][CONF_MAC] == "aabbccddeeff"
-    assert result["title"] == "192.168.1.123"
-    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
 
 
 async def test_full_zeroconf_flow_implementation(
@@ -209,21 +60,140 @@ async def test_full_zeroconf_flow_implementation(
         headers={"Content-Type": CONTENT_TYPE_JSON},
     )
 
-    flow = config_flow.WLEDFlowHandler()
-    flow.hass = hass
-    flow.context = {"source": SOURCE_ZEROCONF}
-    result = await flow.async_step_zeroconf(
-        {"host": "192.168.1.123", "hostname": "example.local.", "properties": {}}
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_ZEROCONF},
+        data={"host": "192.168.1.123", "hostname": "example.local.", "properties": {}},
     )
 
-    assert flow.context[CONF_HOST] == "192.168.1.123"
-    assert flow.context[CONF_NAME] == "example"
-    assert result["description_placeholders"] == {CONF_NAME: "example"}
-    assert result["step_id"] == "zeroconf_confirm"
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    flows = hass.config_entries.flow.async_progress()
+    assert len(flows) == 1
 
-    result = await flow.async_step_zeroconf_confirm(user_input={})
-    assert result["data"][CONF_HOST] == "192.168.1.123"
-    assert result["data"][CONF_MAC] == "aabbccddeeff"
-    assert result["title"] == "example"
-    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result.get("description_placeholders") == {CONF_NAME: "example"}
+    assert result.get("step_id") == "zeroconf_confirm"
+    assert result.get("type") == RESULT_TYPE_FORM
+    assert "flow_id" in result
+
+    flow = flows[0]
+    assert "context" in flow
+    assert flow["context"][CONF_HOST] == "192.168.1.123"
+    assert flow["context"][CONF_NAME] == "example"
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input={}
+    )
+
+    assert result2.get("title") == "example"
+    assert result2.get("type") == RESULT_TYPE_CREATE_ENTRY
+
+    assert "data" in result2
+    assert result2["data"][CONF_HOST] == "192.168.1.123"
+    assert result2["data"][CONF_MAC] == "aabbccddeeff"
+
+
+@patch("homeassistant.components.wled.WLED.update", side_effect=WLEDConnectionError)
+async def test_connection_error(
+    update_mock: MagicMock, hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test we show user form on WLED connection error."""
+    aioclient_mock.get("http://example.com/json/", exc=aiohttp.ClientError)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_USER},
+        data={CONF_HOST: "example.com"},
+    )
+
+    assert result.get("type") == RESULT_TYPE_FORM
+    assert result.get("step_id") == "user"
+    assert result.get("errors") == {"base": "cannot_connect"}
+
+
+@patch("homeassistant.components.wled.WLED.update", side_effect=WLEDConnectionError)
+async def test_zeroconf_connection_error(
+    update_mock: MagicMock, hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test we abort zeroconf flow on WLED connection error."""
+    aioclient_mock.get("http://192.168.1.123/json/", exc=aiohttp.ClientError)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_ZEROCONF},
+        data={"host": "192.168.1.123", "hostname": "example.local.", "properties": {}},
+    )
+
+    assert result.get("type") == RESULT_TYPE_ABORT
+    assert result.get("reason") == "cannot_connect"
+
+
+@patch("homeassistant.components.wled.WLED.update", side_effect=WLEDConnectionError)
+async def test_zeroconf_confirm_connection_error(
+    update_mock: MagicMock, hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test we abort zeroconf flow on WLED connection error."""
+    aioclient_mock.get("http://192.168.1.123:80/json/", exc=aiohttp.ClientError)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={
+            "source": SOURCE_ZEROCONF,
+            CONF_HOST: "example.com",
+            CONF_NAME: "test",
+        },
+        data={"host": "192.168.1.123", "hostname": "example.com.", "properties": {}},
+    )
+
+    assert result.get("type") == RESULT_TYPE_ABORT
+    assert result.get("reason") == "cannot_connect"
+
+
+async def test_user_device_exists_abort(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test we abort zeroconf flow if WLED device already configured."""
+    await init_integration(hass, aioclient_mock)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_USER},
+        data={CONF_HOST: "192.168.1.123"},
+    )
+
+    assert result.get("type") == RESULT_TYPE_ABORT
+    assert result.get("reason") == "already_configured"
+
+
+async def test_zeroconf_device_exists_abort(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test we abort zeroconf flow if WLED device already configured."""
+    await init_integration(hass, aioclient_mock)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_ZEROCONF},
+        data={"host": "192.168.1.123", "hostname": "example.local.", "properties": {}},
+    )
+
+    assert result.get("type") == RESULT_TYPE_ABORT
+    assert result.get("reason") == "already_configured"
+
+
+async def test_zeroconf_with_mac_device_exists_abort(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test we abort zeroconf flow if WLED device already configured."""
+    await init_integration(hass, aioclient_mock)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_ZEROCONF},
+        data={
+            "host": "192.168.1.123",
+            "hostname": "example.local.",
+            "properties": {CONF_MAC: "aabbccddeeff"},
+        },
+    )
+
+    assert result.get("type") == RESULT_TYPE_ABORT
+    assert result.get("reason") == "already_configured"