diff --git a/tests/components/homekit_controller/fixtures/haa_fan.json b/tests/components/homekit_controller/fixtures/haa_fan1.json
similarity index 61%
rename from tests/components/homekit_controller/fixtures/haa_fan.json
rename to tests/components/homekit_controller/fixtures/haa_fan1.json
index a144a9501ba..7389870e195 100644
--- a/tests/components/homekit_controller/fixtures/haa_fan.json
+++ b/tests/components/homekit_controller/fixtures/haa_fan1.json
@@ -9,7 +9,7 @@
         "hidden": false,
         "characteristics": [
           {
-            "aid": 2,
+            "aid": 1,
             "iid": 2,
             "type": "00000023-0000-1000-8000-0026BB765291",
             "perms": ["pr"],
@@ -17,7 +17,7 @@
             "value": "HAA-C718B3"
           },
           {
-            "aid": 2,
+            "aid": 1,
             "iid": 3,
             "type": "00000020-0000-1000-8000-0026BB765291",
             "perms": ["pr"],
@@ -33,7 +33,7 @@
             "value": "C718B3-1"
           },
           {
-            "aid": 2,
+            "aid": 1,
             "iid": 5,
             "type": "00000021-0000-1000-8000-0026BB765291",
             "perms": ["pr"],
@@ -41,7 +41,7 @@
             "value": "RavenSystem HAA"
           },
           {
-            "aid": 2,
+            "aid": 1,
             "iid": 6,
             "type": "00000052-0000-1000-8000-0026BB765291",
             "perms": ["pr"],
@@ -49,7 +49,7 @@
             "value": "5.0.18"
           },
           {
-            "aid": 2,
+            "aid": 1,
             "iid": 7,
             "type": "00000014-0000-1000-8000-0026BB765291",
             "perms": ["pw"],
@@ -130,82 +130,5 @@
         ]
       }
     ]
-  },
-  {
-    "aid": 2,
-    "services": [
-      {
-        "iid": 1,
-        "type": "0000003E-0000-1000-8000-0026BB765291",
-        "primary": false,
-        "hidden": false,
-        "characteristics": [
-          {
-            "aid": 2,
-            "iid": 2,
-            "type": "00000023-0000-1000-8000-0026BB765291",
-            "perms": ["pr"],
-            "format": "string",
-            "value": "HAA-C718B3"
-          },
-          {
-            "aid": 2,
-            "iid": 3,
-            "type": "00000020-0000-1000-8000-0026BB765291",
-            "perms": ["pr"],
-            "format": "string",
-            "value": "Jos\u00e9 A. Jim\u00e9nez Campos"
-          },
-          {
-            "aid": 2,
-            "iid": 4,
-            "type": "00000030-0000-1000-8000-0026BB765291",
-            "perms": ["pr"],
-            "format": "string",
-            "value": "C718B3-2"
-          },
-          {
-            "aid": 2,
-            "iid": 5,
-            "type": "00000021-0000-1000-8000-0026BB765291",
-            "perms": ["pr"],
-            "format": "string",
-            "value": "RavenSystem HAA"
-          },
-          {
-            "aid": 2,
-            "iid": 6,
-            "type": "00000052-0000-1000-8000-0026BB765291",
-            "perms": ["pr"],
-            "format": "string",
-            "value": "5.0.18"
-          },
-          {
-            "aid": 2,
-            "iid": 7,
-            "type": "00000014-0000-1000-8000-0026BB765291",
-            "perms": ["pw"],
-            "format": "bool"
-          }
-        ]
-      },
-      {
-        "iid": 8,
-        "type": "00000049-0000-1000-8000-0026BB765291",
-        "primary": true,
-        "hidden": false,
-        "characteristics": [
-          {
-            "aid": 2,
-            "iid": 9,
-            "type": "00000025-0000-1000-8000-0026BB765291",
-            "perms": ["pr", "pw", "ev"],
-            "ev": true,
-            "format": "bool",
-            "value": false
-          }
-        ]
-      }
-    ]
   }
 ]
diff --git a/tests/components/homekit_controller/fixtures/haa_fan2.json b/tests/components/homekit_controller/fixtures/haa_fan2.json
new file mode 100644
index 00000000000..3cf70c2a85f
--- /dev/null
+++ b/tests/components/homekit_controller/fixtures/haa_fan2.json
@@ -0,0 +1,79 @@
+[
+  {
+    "aid": 1,
+    "services": [
+      {
+        "iid": 1,
+        "type": "0000003E-0000-1000-8000-0026BB765291",
+        "primary": false,
+        "hidden": false,
+        "characteristics": [
+          {
+            "aid": 1,
+            "iid": 2,
+            "type": "00000023-0000-1000-8000-0026BB765291",
+            "perms": ["pr"],
+            "format": "string",
+            "value": "HAA-C718B3"
+          },
+          {
+            "aid": 1,
+            "iid": 3,
+            "type": "00000020-0000-1000-8000-0026BB765291",
+            "perms": ["pr"],
+            "format": "string",
+            "value": "Jos\u00e9 A. Jim\u00e9nez Campos"
+          },
+          {
+            "aid": 1,
+            "iid": 4,
+            "type": "00000030-0000-1000-8000-0026BB765291",
+            "perms": ["pr"],
+            "format": "string",
+            "value": "C718B3-2"
+          },
+          {
+            "aid": 1,
+            "iid": 5,
+            "type": "00000021-0000-1000-8000-0026BB765291",
+            "perms": ["pr"],
+            "format": "string",
+            "value": "RavenSystem HAA"
+          },
+          {
+            "aid": 1,
+            "iid": 6,
+            "type": "00000052-0000-1000-8000-0026BB765291",
+            "perms": ["pr"],
+            "format": "string",
+            "value": "5.0.18"
+          },
+          {
+            "aid": 1,
+            "iid": 7,
+            "type": "00000014-0000-1000-8000-0026BB765291",
+            "perms": ["pw"],
+            "format": "bool"
+          }
+        ]
+      },
+      {
+        "iid": 8,
+        "type": "00000049-0000-1000-8000-0026BB765291",
+        "primary": true,
+        "hidden": false,
+        "characteristics": [
+          {
+            "aid": 1,
+            "iid": 9,
+            "type": "00000025-0000-1000-8000-0026BB765291",
+            "perms": ["pr", "pw", "ev"],
+            "ev": true,
+            "format": "bool",
+            "value": false
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/tests/components/homekit_controller/snapshots/test_init.ambr b/tests/components/homekit_controller/snapshots/test_init.ambr
index 34f613ac027..35a2b4937fc 100644
--- a/tests/components/homekit_controller/snapshots/test_init.ambr
+++ b/tests/components/homekit_controller/snapshots/test_init.ambr
@@ -6660,122 +6660,8 @@
     }),
   ])
 # ---
-# name: test_snapshots[haa_fan]
+# name: test_snapshots[haa_fan1]
   list([
-    dict({
-      'device': dict({
-        'area_id': None,
-        'config_entries': list([
-          'TestData',
-        ]),
-        'configuration_url': None,
-        'connections': list([
-        ]),
-        'disabled_by': None,
-        'entry_type': None,
-        'hw_version': '',
-        'identifiers': list([
-          list([
-            'homekit_controller:accessory-id',
-            '00:00:00:00:00:00:aid:2',
-          ]),
-        ]),
-        'is_new': False,
-        'labels': list([
-        ]),
-        'manufacturer': 'José A. Jiménez Campos',
-        'model': 'RavenSystem HAA',
-        'name': 'HAA-C718B3',
-        'name_by_user': None,
-        'primary_integration': 'homekit_controller',
-        'serial_number': 'C718B3-2',
-        'suggested_area': None,
-        'sw_version': '5.0.18',
-      }),
-      'entities': list([
-        dict({
-          'entry': dict({
-            'aliases': list([
-            ]),
-            'area_id': None,
-            'capabilities': None,
-            'categories': dict({
-            }),
-            'config_entry_id': 'TestData',
-            'device_class': None,
-            'disabled_by': None,
-            'domain': 'button',
-            'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
-            'entity_id': 'button.haa_c718b3_identify_2',
-            'has_entity_name': False,
-            'hidden_by': None,
-            'icon': None,
-            'labels': list([
-            ]),
-            'name': None,
-            'options': dict({
-            }),
-            'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
-            'original_icon': None,
-            'original_name': 'HAA-C718B3 Identify',
-            'platform': 'homekit_controller',
-            'previous_unique_id': None,
-            'supported_features': 0,
-            'translation_key': None,
-            'unique_id': '00:00:00:00:00:00_2_1_7',
-            'unit_of_measurement': None,
-          }),
-          'state': dict({
-            'attributes': dict({
-              'device_class': 'identify',
-              'friendly_name': 'HAA-C718B3 Identify',
-            }),
-            'entity_id': 'button.haa_c718b3_identify_2',
-            'state': 'unknown',
-          }),
-        }),
-        dict({
-          'entry': dict({
-            'aliases': list([
-            ]),
-            'area_id': None,
-            'capabilities': None,
-            'categories': dict({
-            }),
-            'config_entry_id': 'TestData',
-            'device_class': None,
-            'disabled_by': None,
-            'domain': 'switch',
-            'entity_category': None,
-            'entity_id': 'switch.haa_c718b3',
-            'has_entity_name': False,
-            'hidden_by': None,
-            'icon': None,
-            'labels': list([
-            ]),
-            'name': None,
-            'options': dict({
-            }),
-            'original_device_class': None,
-            'original_icon': None,
-            'original_name': 'HAA-C718B3',
-            'platform': 'homekit_controller',
-            'previous_unique_id': None,
-            'supported_features': 0,
-            'translation_key': None,
-            'unique_id': '00:00:00:00:00:00_2_8',
-            'unit_of_measurement': None,
-          }),
-          'state': dict({
-            'attributes': dict({
-              'friendly_name': 'HAA-C718B3',
-            }),
-            'entity_id': 'switch.haa_c718b3',
-            'state': 'off',
-          }),
-        }),
-      ]),
-    }),
     dict({
       'device': dict({
         'area_id': None,
@@ -6980,6 +6866,444 @@
     }),
   ])
 # ---
+# name: test_snapshots[haa_fan2]
+  list([
+    dict({
+      'device': dict({
+        'area_id': None,
+        'config_entries': list([
+          'TestData',
+        ]),
+        'configuration_url': None,
+        'connections': list([
+        ]),
+        'disabled_by': None,
+        'entry_type': None,
+        'hw_version': '',
+        'identifiers': list([
+          list([
+            'homekit_controller:accessory-id',
+            '00:00:00:00:00:00:aid:1',
+          ]),
+        ]),
+        'is_new': False,
+        'labels': list([
+        ]),
+        'manufacturer': 'José A. Jiménez Campos',
+        'model': 'RavenSystem HAA',
+        'name': 'HAA-C718B3',
+        'name_by_user': None,
+        'primary_integration': 'homekit_controller',
+        'serial_number': 'C718B3-2',
+        'suggested_area': None,
+        'sw_version': '5.0.18',
+      }),
+      'entities': list([
+        dict({
+          'entry': dict({
+            'aliases': list([
+            ]),
+            'area_id': None,
+            'capabilities': None,
+            'categories': dict({
+            }),
+            'config_entry_id': 'TestData',
+            'device_class': None,
+            'disabled_by': None,
+            'domain': 'button',
+            'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+            'entity_id': 'button.haa_c718b3_identify',
+            'has_entity_name': False,
+            'hidden_by': None,
+            'icon': None,
+            'labels': list([
+            ]),
+            'name': None,
+            'options': dict({
+            }),
+            'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
+            'original_icon': None,
+            'original_name': 'HAA-C718B3 Identify',
+            'platform': 'homekit_controller',
+            'previous_unique_id': None,
+            'supported_features': 0,
+            'translation_key': None,
+            'unique_id': '00:00:00:00:00:00_1_1_7',
+            'unit_of_measurement': None,
+          }),
+          'state': dict({
+            'attributes': dict({
+              'device_class': 'identify',
+              'friendly_name': 'HAA-C718B3 Identify',
+            }),
+            'entity_id': 'button.haa_c718b3_identify',
+            'state': 'unknown',
+          }),
+        }),
+        dict({
+          'entry': dict({
+            'aliases': list([
+            ]),
+            'area_id': None,
+            'capabilities': None,
+            'categories': dict({
+            }),
+            'config_entry_id': 'TestData',
+            'device_class': None,
+            'disabled_by': None,
+            'domain': 'switch',
+            'entity_category': None,
+            'entity_id': 'switch.haa_c718b3',
+            'has_entity_name': False,
+            'hidden_by': None,
+            'icon': None,
+            'labels': list([
+            ]),
+            'name': None,
+            'options': dict({
+            }),
+            'original_device_class': None,
+            'original_icon': None,
+            'original_name': 'HAA-C718B3',
+            'platform': 'homekit_controller',
+            'previous_unique_id': None,
+            'supported_features': 0,
+            'translation_key': None,
+            'unique_id': '00:00:00:00:00:00_1_8',
+            'unit_of_measurement': None,
+          }),
+          'state': dict({
+            'attributes': dict({
+              'friendly_name': 'HAA-C718B3',
+            }),
+            'entity_id': 'switch.haa_c718b3',
+            'state': 'off',
+          }),
+        }),
+      ]),
+    }),
+  ])
+# ---
+# name: test_snapshots[haa_fan]
+  list([
+    dict({
+      'device': dict({
+        'area_id': None,
+        'config_entries': list([
+          'TestData',
+        ]),
+        'configuration_url': None,
+        'connections': list([
+        ]),
+        'disabled_by': None,
+        'entry_type': None,
+        'hw_version': '',
+        'identifiers': list([
+          list([
+            'homekit_controller:accessory-id',
+            '00:00:00:00:00:00:aid:1',
+          ]),
+        ]),
+        'is_new': False,
+        'labels': list([
+        ]),
+        'manufacturer': 'José A. Jiménez Campos',
+        'model': 'RavenSystem HAA',
+        'name': 'HAA-C718B3',
+        'name_by_user': None,
+        'primary_integration': 'homekit_controller',
+        'serial_number': 'C718B3-1',
+        'suggested_area': None,
+        'sw_version': '5.0.18',
+      }),
+      'entities': list([
+        dict({
+          'entry': dict({
+            'aliases': list([
+            ]),
+            'area_id': None,
+            'capabilities': None,
+            'categories': dict({
+            }),
+            'config_entry_id': 'TestData',
+            'device_class': None,
+            'disabled_by': None,
+            'domain': 'button',
+            'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+            'entity_id': 'button.haa_c718b3_identify',
+            'has_entity_name': False,
+            'hidden_by': None,
+            'icon': None,
+            'labels': list([
+            ]),
+            'name': None,
+            'options': dict({
+            }),
+            'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
+            'original_icon': None,
+            'original_name': 'HAA-C718B3 Identify',
+            'platform': 'homekit_controller',
+            'previous_unique_id': None,
+            'supported_features': 0,
+            'translation_key': None,
+            'unique_id': '00:00:00:00:00:00_1_1_7',
+            'unit_of_measurement': None,
+          }),
+          'state': dict({
+            'attributes': dict({
+              'device_class': 'identify',
+              'friendly_name': 'HAA-C718B3 Identify',
+            }),
+            'entity_id': 'button.haa_c718b3_identify',
+            'state': 'unknown',
+          }),
+        }),
+        dict({
+          'entry': dict({
+            'aliases': list([
+            ]),
+            'area_id': None,
+            'capabilities': None,
+            'categories': dict({
+            }),
+            'config_entry_id': 'TestData',
+            'device_class': None,
+            'disabled_by': None,
+            'domain': 'button',
+            'entity_category': <EntityCategory.CONFIG: 'config'>,
+            'entity_id': 'button.haa_c718b3_setup',
+            'has_entity_name': False,
+            'hidden_by': None,
+            'icon': None,
+            'labels': list([
+            ]),
+            'name': None,
+            'options': dict({
+            }),
+            'original_device_class': None,
+            'original_icon': None,
+            'original_name': 'HAA-C718B3 Setup',
+            'platform': 'homekit_controller',
+            'previous_unique_id': None,
+            'supported_features': 0,
+            'translation_key': 'setup',
+            'unique_id': '00:00:00:00:00:00_1_1010_1012',
+            'unit_of_measurement': None,
+          }),
+          'state': dict({
+            'attributes': dict({
+              'friendly_name': 'HAA-C718B3 Setup',
+            }),
+            'entity_id': 'button.haa_c718b3_setup',
+            'state': 'unknown',
+          }),
+        }),
+        dict({
+          'entry': dict({
+            'aliases': list([
+            ]),
+            'area_id': None,
+            'capabilities': None,
+            'categories': dict({
+            }),
+            'config_entry_id': 'TestData',
+            'device_class': None,
+            'disabled_by': None,
+            'domain': 'button',
+            'entity_category': <EntityCategory.CONFIG: 'config'>,
+            'entity_id': 'button.haa_c718b3_update',
+            'has_entity_name': False,
+            'hidden_by': None,
+            'icon': None,
+            'labels': list([
+            ]),
+            'name': None,
+            'options': dict({
+            }),
+            'original_device_class': <ButtonDeviceClass.UPDATE: 'update'>,
+            'original_icon': None,
+            'original_name': 'HAA-C718B3 Update',
+            'platform': 'homekit_controller',
+            'previous_unique_id': None,
+            'supported_features': 0,
+            'translation_key': None,
+            'unique_id': '00:00:00:00:00:00_1_1010_1011',
+            'unit_of_measurement': None,
+          }),
+          'state': dict({
+            'attributes': dict({
+              'device_class': 'update',
+              'friendly_name': 'HAA-C718B3 Update',
+            }),
+            'entity_id': 'button.haa_c718b3_update',
+            'state': 'unknown',
+          }),
+        }),
+        dict({
+          'entry': dict({
+            'aliases': list([
+            ]),
+            'area_id': None,
+            'capabilities': dict({
+              'preset_modes': None,
+            }),
+            'categories': dict({
+            }),
+            'config_entry_id': 'TestData',
+            'device_class': None,
+            'disabled_by': None,
+            'domain': 'fan',
+            'entity_category': None,
+            'entity_id': 'fan.haa_c718b3',
+            'has_entity_name': False,
+            'hidden_by': None,
+            'icon': None,
+            'labels': list([
+            ]),
+            'name': None,
+            'options': dict({
+            }),
+            'original_device_class': None,
+            'original_icon': None,
+            'original_name': 'HAA-C718B3',
+            'platform': 'homekit_controller',
+            'previous_unique_id': None,
+            'supported_features': <FanEntityFeature: 1>,
+            'translation_key': None,
+            'unique_id': '00:00:00:00:00:00_1_8',
+            'unit_of_measurement': None,
+          }),
+          'state': dict({
+            'attributes': dict({
+              'friendly_name': 'HAA-C718B3',
+              'percentage': 66,
+              'percentage_step': 33.333333333333336,
+              'preset_mode': None,
+              'preset_modes': None,
+              'supported_features': <FanEntityFeature: 1>,
+            }),
+            'entity_id': 'fan.haa_c718b3',
+            'state': 'on',
+          }),
+        }),
+      ]),
+    }),
+    dict({
+      'device': dict({
+        'area_id': None,
+        'config_entries': list([
+          'TestData',
+        ]),
+        'configuration_url': None,
+        'connections': list([
+        ]),
+        'disabled_by': None,
+        'entry_type': None,
+        'hw_version': '',
+        'identifiers': list([
+          list([
+            'homekit_controller:accessory-id',
+            '00:00:00:00:00:00:aid:2',
+          ]),
+        ]),
+        'is_new': False,
+        'labels': list([
+        ]),
+        'manufacturer': 'José A. Jiménez Campos',
+        'model': 'RavenSystem HAA',
+        'name': 'HAA-C718B3',
+        'name_by_user': None,
+        'primary_integration': 'homekit_controller',
+        'serial_number': 'C718B3-2',
+        'suggested_area': None,
+        'sw_version': '5.0.18',
+      }),
+      'entities': list([
+        dict({
+          'entry': dict({
+            'aliases': list([
+            ]),
+            'area_id': None,
+            'capabilities': None,
+            'categories': dict({
+            }),
+            'config_entry_id': 'TestData',
+            'device_class': None,
+            'disabled_by': None,
+            'domain': 'button',
+            'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
+            'entity_id': 'button.haa_c718b3_identify_2',
+            'has_entity_name': False,
+            'hidden_by': None,
+            'icon': None,
+            'labels': list([
+            ]),
+            'name': None,
+            'options': dict({
+            }),
+            'original_device_class': <ButtonDeviceClass.IDENTIFY: 'identify'>,
+            'original_icon': None,
+            'original_name': 'HAA-C718B3 Identify',
+            'platform': 'homekit_controller',
+            'previous_unique_id': None,
+            'supported_features': 0,
+            'translation_key': None,
+            'unique_id': '00:00:00:00:00:00_2_1_7',
+            'unit_of_measurement': None,
+          }),
+          'state': dict({
+            'attributes': dict({
+              'device_class': 'identify',
+              'friendly_name': 'HAA-C718B3 Identify',
+            }),
+            'entity_id': 'button.haa_c718b3_identify_2',
+            'state': 'unknown',
+          }),
+        }),
+        dict({
+          'entry': dict({
+            'aliases': list([
+            ]),
+            'area_id': None,
+            'capabilities': None,
+            'categories': dict({
+            }),
+            'config_entry_id': 'TestData',
+            'device_class': None,
+            'disabled_by': None,
+            'domain': 'switch',
+            'entity_category': None,
+            'entity_id': 'switch.haa_c718b3',
+            'has_entity_name': False,
+            'hidden_by': None,
+            'icon': None,
+            'labels': list([
+            ]),
+            'name': None,
+            'options': dict({
+            }),
+            'original_device_class': None,
+            'original_icon': None,
+            'original_name': 'HAA-C718B3',
+            'platform': 'homekit_controller',
+            'previous_unique_id': None,
+            'supported_features': 0,
+            'translation_key': None,
+            'unique_id': '00:00:00:00:00:00_2_8',
+            'unit_of_measurement': None,
+          }),
+          'state': dict({
+            'attributes': dict({
+              'friendly_name': 'HAA-C718B3',
+            }),
+            'entity_id': 'switch.haa_c718b3',
+            'state': 'off',
+          }),
+        }),
+      ]),
+    }),
+  ])
+# ---
 # name: test_snapshots[home_assistant_bridge_basic_cover]
   list([
     dict({