diff --git a/homeassistant/components/almond/config_flow.py b/homeassistant/components/almond/config_flow.py
index ba6fcb6d83c..bc945025c24 100644
--- a/homeassistant/components/almond/config_flow.py
+++ b/homeassistant/components/almond/config_flow.py
@@ -11,12 +11,12 @@ from pyalmond import AlmondLocalAuth, WebAlmondAPI
 import voluptuous as vol
 from yarl import URL
 
-from homeassistant import config_entries, core, data_entry_flow
+from homeassistant import core, data_entry_flow
 from homeassistant.components.hassio import HassioServiceInfo
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.helpers import aiohttp_client, config_entry_oauth2_flow
 
-from .const import DOMAIN as ALMOND_DOMAIN, TYPE_LOCAL, TYPE_OAUTH2
+from .const import DOMAIN, TYPE_LOCAL, TYPE_OAUTH2
 
 
 async def async_verify_local_connection(hass: core.HomeAssistant, host: str):
@@ -33,11 +33,12 @@ async def async_verify_local_connection(hass: core.HomeAssistant, host: str):
         return False
 
 
-@config_entries.HANDLERS.register(ALMOND_DOMAIN)
-class AlmondFlowHandler(config_entry_oauth2_flow.AbstractOAuth2FlowHandler):
+class AlmondFlowHandler(
+    config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN
+):
     """Implementation of the Almond OAuth2 config flow."""
 
-    DOMAIN = ALMOND_DOMAIN
+    DOMAIN = DOMAIN
 
     host = None
     hassio_discovery = None
diff --git a/homeassistant/components/hangouts/config_flow.py b/homeassistant/components/hangouts/config_flow.py
index adf62d348f4..598c7fbd9cb 100644
--- a/homeassistant/components/hangouts/config_flow.py
+++ b/homeassistant/components/hangouts/config_flow.py
@@ -7,12 +7,7 @@ import voluptuous as vol
 from homeassistant import config_entries
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
 
-from .const import (
-    CONF_2FA,
-    CONF_AUTH_CODE,
-    CONF_REFRESH_TOKEN,
-    DOMAIN as HANGOUTS_DOMAIN,
-)
+from .const import CONF_2FA, CONF_AUTH_CODE, CONF_REFRESH_TOKEN, DOMAIN
 from .hangups_utils import (
     Google2FAError,
     GoogleAuthError,
@@ -21,8 +16,7 @@ from .hangups_utils import (
 )
 
 
-@config_entries.HANDLERS.register(HANGOUTS_DOMAIN)
-class HangoutsFlowHandler(config_entries.ConfigFlow):
+class HangoutsFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Config flow Google Hangouts."""
 
     VERSION = 1
diff --git a/homeassistant/components/homematicip_cloud/config_flow.py b/homeassistant/components/homematicip_cloud/config_flow.py
index 6cf6335b874..3fedff3f579 100644
--- a/homeassistant/components/homematicip_cloud/config_flow.py
+++ b/homeassistant/components/homematicip_cloud/config_flow.py
@@ -6,19 +6,11 @@ import voluptuous as vol
 from homeassistant import config_entries
 from homeassistant.data_entry_flow import FlowResult
 
-from .const import (
-    _LOGGER,
-    DOMAIN as HMIPC_DOMAIN,
-    HMIPC_AUTHTOKEN,
-    HMIPC_HAPID,
-    HMIPC_NAME,
-    HMIPC_PIN,
-)
+from .const import _LOGGER, DOMAIN, HMIPC_AUTHTOKEN, HMIPC_HAPID, HMIPC_NAME, HMIPC_PIN
 from .hap import HomematicipAuth
 
 
-@config_entries.HANDLERS.register(HMIPC_DOMAIN)
-class HomematicipCloudFlowHandler(config_entries.ConfigFlow):
+class HomematicipCloudFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Config flow for the HomematicIP Cloud component."""
 
     VERSION = 1