diff --git a/homeassistant/components/fritz/config_flow.py b/homeassistant/components/fritz/config_flow.py
index 270e9870c63..cd8dda57402 100644
--- a/homeassistant/components/fritz/config_flow.py
+++ b/homeassistant/components/fritz/config_flow.py
@@ -283,6 +283,7 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
         self._username = user_input[CONF_USERNAME]
         self._password = user_input[CONF_PASSWORD]
         self._use_tls = user_input[CONF_SSL]
+        self._feature_device_discovery = user_input[CONF_FEATURE_DEVICE_TRACKING]
 
         self._port = self._determine_port(user_input)
 
diff --git a/tests/components/fritz/test_config_flow.py b/tests/components/fritz/test_config_flow.py
index 809eea7815e..c8057a09d1b 100644
--- a/tests/components/fritz/test_config_flow.py
+++ b/tests/components/fritz/test_config_flow.py
@@ -57,7 +57,7 @@ from tests.common import MockConfigEntry
 
 
 @pytest.mark.parametrize(
-    ("show_advanced_options", "user_input", "expected_config"),
+    ("show_advanced_options", "user_input", "expected_config", "expected_options"),
     [
         (
             True,
@@ -69,6 +69,11 @@ from tests.common import MockConfigEntry
                 CONF_PORT: 1234,
                 CONF_SSL: False,
             },
+            {
+                CONF_OLD_DISCOVERY: False,
+                CONF_CONSIDER_HOME: DEFAULT_CONSIDER_HOME.total_seconds(),
+                CONF_FEATURE_DEVICE_TRACKING: True,
+            },
         ),
         (
             False,
@@ -80,10 +85,19 @@ from tests.common import MockConfigEntry
                 CONF_PORT: 49000,
                 CONF_SSL: False,
             },
+            {
+                CONF_OLD_DISCOVERY: False,
+                CONF_CONSIDER_HOME: DEFAULT_CONSIDER_HOME.total_seconds(),
+                CONF_FEATURE_DEVICE_TRACKING: True,
+            },
         ),
         (
             False,
-            {**MOCK_USER_INPUT_SIMPLE, CONF_SSL: True},
+            {
+                **MOCK_USER_INPUT_SIMPLE,
+                CONF_SSL: True,
+                CONF_FEATURE_DEVICE_TRACKING: False,
+            },
             {
                 CONF_HOST: "fake_host",
                 CONF_PASSWORD: "fake_pass",
@@ -91,6 +105,11 @@ from tests.common import MockConfigEntry
                 CONF_PORT: 49443,
                 CONF_SSL: True,
             },
+            {
+                CONF_OLD_DISCOVERY: False,
+                CONF_CONSIDER_HOME: DEFAULT_CONSIDER_HOME.total_seconds(),
+                CONF_FEATURE_DEVICE_TRACKING: False,
+            },
         ),
     ],
 )
@@ -100,6 +119,7 @@ async def test_user(
     show_advanced_options: bool,
     user_input: dict,
     expected_config: dict,
+    expected_options: dict,
 ) -> None:
     """Test starting a flow by user."""
     with (
@@ -143,10 +163,7 @@ async def test_user(
         )
         assert result["type"] is FlowResultType.CREATE_ENTRY
         assert result["data"] == expected_config
-        assert (
-            result["options"][CONF_CONSIDER_HOME]
-            == DEFAULT_CONSIDER_HOME.total_seconds()
-        )
+        assert result["options"] == expected_options
         assert not result["result"].unique_id
 
     assert mock_setup_entry.called